Merge branch 'branch-nt-1.0.0' of https://git.flowbb.cn/RK-Dev/fqgz-server into branch-nt-1.0.0

eladmin-system/src/main/java/me/zhengjie/domain/model/ModelSynthesizerDomain.java

@@ -117,12 +117,14 @@ public class ModelSynthesizerDomain {
                 map.put("$MateBirthday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getIdCard().substring(6, 14), "yyyyMMdd"));
                 map.put("$MateAddr$", contractOrderEntity.getJointResidence());
                 map.put("$MatePhone$", contractOrderEntity.getJointPhone());
+                map.put("$MateIDNo$", contractOrderEntity.getJointIdCard());
             } else {
                 map.put("$MateName$", "无");
                 map.put("$MateSex$", "无");
                 map.put("$MateBirthday$", "无");
                 map.put("$MateAddr$", "无");
                 map.put("$MatePhone$", "无");
+                map.put("$MateIDNo$", "无");
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -313,12 +315,14 @@ public class ModelSynthesizerDomain {
                 noteValue.put("$MateBirthday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getIdCard().substring(6, 14), "yyyyMMdd"));
                 noteValue.put("$MateAddr$", contractOrderEntity.getJointResidence());
                 noteValue.put("$MatePhone$", contractOrderEntity.getJointPhone());
+                noteValue.put("$MateIDNo$", contractOrderEntity.getJointIdCard());
             } else {
                 noteValue.put("$MateName$", "无");
                 noteValue.put("$MateSex$", "无");
                 noteValue.put("$MateBirthday$", "无");
                 noteValue.put("$MateAddr$", "无");
                 noteValue.put("$MatePhone$", "无");
+                noteValue.put("$MateIDNo$", "无");
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -420,12 +424,14 @@ public class ModelSynthesizerDomain {
                 map.put("$MateBirthday$", DateUtil.formatDateWithChineseSeparatorAndNoZeroFilled(contractOrderEntity.getIdCard().substring(6, 14), "yyyyMMdd"));
                 map.put("$MateAddr$", contractOrderEntity.getJointResidence());
                 map.put("$MatePhone$", contractOrderEntity.getJointPhone());
+                map.put("$MateIDNo$", contractOrderEntity.getJointIdCard());
             } else {
                 map.put("$MateName$", "无");
                 map.put("$MateSex$", "无");
                 map.put("$MateBirthday$", "无");
                 map.put("$MateAddr$", "无");
                 map.put("$MatePhone$", "无");
+                map.put("$MateIDNo$", "无");
             }
         } catch (Exception e) {
             e.printStackTrace();

eladmin-system/src/main/resources/config/application-nt-test.yml

@@ -180,8 +180,8 @@ tencent:
     secret: pzFuoHgzUWHKw01XT0H7FIMDMf0a58JsTP31gE1hpP5T5uY1RfyAGftROvAiMery
     keyLicence: gDsQvwRTlBm4/gdPKXaG6iKnjbpF9irGFpAGVP5yIw3MKZKybnnOGoHs+5cOV2W2z4dyUmiu1yXuUGKuvtwaWRDPoaPvCMFShdy7oEY61Zc0N/0uCvU2qXP+l/ULp2fnnOXJxLRb+Ldsnj2V9LuBgOnyvFyVQ/HPh90ood2X1F0bunPOAIzXmffDLgeO6ZlCF6nLN0cEBkm7m80p6hp25NqdfxfN9n2E+j6rBJe2NLKMazbd+HRaFvWs5PPpR2FowvQPYXiYI8xDMCxhE94waN4E3/BuCY1blf1vxH60DlAB21Z8dP38kwTUXejm0ybvUHu4iyFMCjkPy+XuvslJGw==
   ttlsig:
-    sdkappid: 1400743315
-    key: 3b8f5b1a04511a8e9f40a90b61bc8312452226416c5e533e81cbbf52e9b0e351
+    sdkappid: 1400750717
+    key: 5d96c3055cb817756f008ce5a098799e7c6122ef0f8a05469e476a79dd821b9a
 
 xxl:
   job: