Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/domain/dto/ReimbursementBusinessDTO.java

@@ -30,6 +30,6 @@ public class ReimbursementBusinessDTO extends BaseEntity {
     private String reimbursementAmount;  //报销额度
     private String remainReimbursementAmount;  //剩余报销额度
     private String remarks; //备注
-    private int reimbursementAddress;  //报销类型（1：正常报销；2：补差）
+    private int reimbursementAddress;  //地区类型（1：正常报销；2：武汉）
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursementsys/service/impl/WuHanReimbursementSysServiceImpl.java

@@ -324,7 +324,7 @@ public class WuHanReimbursementSysServiceImpl implements WuHanReimbursementSysSe
                         //将新的序列号进行向左补齐4位
                         String padLeft = PublicUtil.padLeft(randomBusinessCodeIndex.toString(), 4, '0');
                         //生成新的随机业务编号
-                        StringBuilder sbCode = new StringBuilder().append(year).append("-zssj-").append(padLeft);
+                        StringBuilder sbCode = new StringBuilder().append(year).append("-whsj-").append(padLeft);
                         reimbursement.setBusinessCode(sbCode.toString());
                     }