message
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
message
Signed-off-by: qjj <qjj@126.com>
Change-Id: I2f526cc51e5f2c8a598320ab48c4da4fa32ea8e1
Merge branch 'master' of scm@192.168.1.10:/home/scm/repositories/sxj-src.git
Signed-off-by: qjj <qjj@126.com>
Signed-off-by: qjj <qjj@126.com>
Signed-off-by: qjj <qjj@126.com>
Signed-off-by: qjj <qjj@126.com>
Change-Id: I172242785d3a5fc9c59b112aca0651202dfcc8e8
Signed-off-by: qjj <qjj@126.com>
message
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: Id2e609e7de3901dccaedc6f3a3b39d7e7a8d5c57
Merge branch 'master' of scm@192.168.1.10:/home/scm/repositories/sxj-src.git
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-dao/src/main/java/com/sxj/supervisor/entity/member/AccountEntity.java
Change-Id: I69490d3031b216b301afa94bdf97aa363094ef9f
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src