Change-Id: I0ba074d6752b47c42bdda22f7245c3a6ad9885f0
message
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I7190c7f5a4519ffaa53875e410a5f5edf0f2ce82
Change-Id: I44f5561884808693d16c764457540713a533a9dd
Change-Id: Ibe8c486cff96f969325bc4aa6cc0b3e5043a303f
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
Change-Id: Ib1c7213d80561d9a6b532920cac3fd7f8934c3de
Change-Id: If274a6681cb33ea92c47b2fb6c5db2cfcdd46855
Change-Id: I4d86cb9e192fc33eebd3623e0a9a9a87fc9da9cc
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: Ie4720447afcba6ac39dd1a00f751399df5c61481
Change-Id: I75e5134362bcf41674bee8da0a4373325b955b40
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
me
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-website/src/main/java/com/sxj/supervisor/website/controller/BaseController.java
Signed-off-by: djx <dujinxin1330@163.com>
Merge branch 'master' of scm@192.168.1.10:/home/scm/repositories/sxj-src.git
Change-Id: I8e94703680b851bbdeb8145592ccef0f8f346539