Signed-off-by: qjj <qjj@126.com>
Change-Id: Icfe6706defea88826034c832f800998afd5137eb
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Signed-off-by: Ann <Ann@An-PC>
Change-Id: I046ec3a61fd53f402d718c8eb5d90def5bd246bb
dfdfd
Change-Id: I59900e83394a08065bbd0360d1be7f07380adefb
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/comet/MessageConnectListener.java
Change-Id: I2c42723ef077bd8064ad3552ffba38d2ce2111dc
Change-Id: I7f681f274f6f20ba9dba5431f42796b9696a4cef
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-manager/src/main/webapp/WEB-INF/views/fm/manage/contract/contract-info-zhaobiao.html
	supervisor-parent/supervisor-manager/src/main/webapp/WEB-INF/views/fm/manage/record/record_edit_zhaobiao.html
	supervisor-parent/supervisor-website/src/main/webapp/WEB-INF/views/fm/site/record/contract-info-zhaobiao.html
Change-Id: I0862dd7f25dafe3abd5446975dbb3705dd8b9e0e
Signed-off-by: Ann <Ann@An-PC>
Signed-off-by: djx <dujinxin1330@163.com>
Signed-off-by: djx <dujinxin1330@163.com>
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-website/src/main/webapp/WEB-INF/views/fm/site/record/apply-record.html
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: Ie574d5ba0b1971ee5989b4f66b27ba7ca118c9b0