Change-Id: I9e0785dfe3c21d3d8aa15ba6b8fa4773609fd359
Change-Id: Ic482d0dfd3614a29ccd11f9d0e32c777ed74028a
Change-Id: If57b4c6fcd57f1e0f64d9e5af72134a94bafc6db
Change-Id: I9bb83a72ceaab33d75cc6df7c59b98f325285fb0
Change-Id: Ibe1006747e04fc0ae0639588c7eeb67fb7f44229
Signed-off-by: Ann <Ann@An-PC>
Change-Id: I724c65e7fc2afc43a8685629cafd4dc45046dbe4
123123
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Signed-off-by: Ann <Ann@An-PC>
Change-Id: I35734760d47f5dda969a7ec9a105daeab5be66c1
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-changes.html
Change-Id: I2b43479e8442f91ab0d0f2548188313d8ef03c3c
Change-Id: I51d9f4950b1564474ab5dcc3c83db734214c5e64
Change-Id: Iff51ce18e7ed72bfa5bf89d36ee8c246468245e4
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src
Change-Id: Ibc7e987437333ad2d76b7b88da891cca191b4aed
123123
message
Merge branch 'master' of 192.168.1.10:/home/scm/repositories/sxj-src