RenGuoQiang@PC-RENGUOQIANG MINGW64 /d/zgg/zgg-crm (dev-rgq-userworkstatus)
$ git branch
  dev-rgq
  dev-rgq-leadfromofficalsite
* dev-rgq-userworkstatus
  llw-dev
  master

RenGuoQiang@PC-RENGUOQIANG MINGW64 /d/zgg/zgg-crm (dev-rgq-userworkstatus)
$ git branch master
fatal: A branch named 'master' already exists.
Eclipse里EGit切换分支


RenGuoQiang@PC-RENGUOQIANG MINGW64 /d/zgg/zgg-crm (dev-rgq-userworkstatus)
$ git branch
  dev-rgq
  dev-rgq-leadfromofficalsite
  dev-rgq-userworkstatus
  llw-dev
* master

RenGuoQiang@PC-RENGUOQIANG MINGW64 /d/zgg/zgg-crm (master)
$ git merge --no-ff dev-rgq-userworkstatus
Merge made by the 'recursive' strategy.
 .classpath                                         |   2 +
 .settings/org.eclipse.jdt.core.prefs               |   6 +-
 .settings/org.eclipse.wst.common.component         |  21 +-
 .../org.eclipse.wst.common.project.facet.core.xml  |   4 +-
 .../crm/service/impl/AuthorityServiceImpl.java     |   1 +
 .../crm/service/impl/WorkStatusLogServiceImpl.java |  31 +-
 src/main/java/com/zgg/crm/constants/Constants.java |  10 -
 .../core/interceptors/SqlInjectInterceptor.java    |   1 +
 .../system/controller/core/LoginController.java    | 132 +----
 .../web/system/controller/core/UserController.java |  29 +-
 .../web/system/listener/OnlineListener.java        |  53 +-
 .../web/system/pojo/base/TSBaseUser.java           |  19 +-
 .../web/system/pojo/base/TSUser.java               | 659 +++++++++++----------
 .../web/system/service/impl/UserServiceImpl.java   |  44 +-
 src/main/resources/log4j.properties                |  34 +-
 src/main/webapp/plug-in/graphreport/x_js.js        |   1 +
 16 files changed, 514 insertions(+), 533 deletions(-)

RenGuoQiang@PC-RENGUOQIANG MINGW64 /d/zgg/zgg-crm (master)