Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledObjsDto.java

@@ -35,7 +35,7 @@ public class AlertCalledObjsDto extends BaseDto{
          String value="";
 
         for (AlertFormValue al : alertFormValue) {
-            if (al.getFieldCode() == "remark") {
+            if (al.getFieldCode().equals("remark")) {
                 value=al.getFieldValue();
             }
         }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferCompanyMapper.xml

@@ -14,7 +14,7 @@
 FROM
 	(
 	SELECT
-		a.sequence_nbr,
+		MD5(RAND() * 10000) sequence_nbr,
 		a.dispatch_type,
 		a.rec_date,
 		a.address,