Change-Id: I8677b58213f86e8383a832b80d9c5b661a65cadf
2014/11/24
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: I0a0c77b31f02c0492433697cd09559fc67db835d
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src

Conflicts:
	supervisor-parent/supervisor-website/pom.xml
me
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
123
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/pay/pay-list.html
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/progress.html
Signed-off-by: redtroy <redtroy@sxj.com>
12
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: I79dc0af2a9c51aa8adece7830b331cc69b5cb675
Change-Id: I07c81bed65244a6407a846a8ceecb9fc1c83d729
12
Change-Id: I235972b78534c681f5590f7d1c7ddcf4b57cb230
Merge branch 'master' of scm@192.168.1.10:/home/scm/repositories/sxj-src.git
Change-Id: I6d56be3e7afe8436af9108c7f8a545328579df98