MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -261,16 +261,16 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         Calendar rightNow = Calendar.getInstance();
         Map<String, Object> bindingMap = new HashMap<>();
 
-        bindingMap.put("username", jsonHandle(maps,"username"));
-        bindingMap.put("s", jsonHandle(maps,"s"));
-        bindingMap.put("post", jsonHandle(maps,"post"));
+        bindingMap.put("username", jsonHandle(maps,"name"));
+        bindingMap.put("s", jsonHandle(maps,"sex"));
+        bindingMap.put("post", jsonHandle(maps,"apply_post"));
         bindingMap.put("idcard", jsonHandle(maps,"idcard"));
-        bindingMap.put("phone", jsonHandle(maps,"phone"));
+        bindingMap.put("phone", jsonHandle(maps,"telphone"));
         bindingMap.put("school", jsonHandle(maps,"school"));
-        bindingMap.put("edu", jsonHandle(maps,"edu"));
+        bindingMap.put("edu", jsonHandle(maps,"education"));
         bindingMap.put("major", jsonHandle(maps,"major"));
-        bindingMap.put("cname", jsonHandle(maps,"cname"));
-        bindingMap.put("cphone", jsonHandle(maps,"cphone"));
+        bindingMap.put("cname", jsonHandle(maps,"unit_contact"));
+        bindingMap.put("cphone", jsonHandle(maps,"unit_tel"));
         bindingMap.put("image", ALIYUN_OSS_ENDPOINT + "/" + jsonHandle(maps,"commitment_electr_signature"));
         bindingMap.put("y", Convert.toStr(rightNow.get(Calendar.YEAR)));
         bindingMap.put("m", rightNow.get(Calendar.MONTH) + 1);

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankAddBo.java

@@ -135,4 +135,6 @@ public class GoodsBankAddBo {
     private String externalLink;
     @ApiModelProperty("是否外链商品：0否 1是")
     private Integer externalLinkStatus;
+    @ApiModelProperty("寄件标签：1是 0否")
+    private Integer mailSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankEditBo.java

@@ -164,4 +164,6 @@ public class GoodsBankEditBo {
     private String externalLink;
     @ApiModelProperty("是否外链商品：0否 1是")
     private Integer externalLinkStatus;
+    @ApiModelProperty("寄件标签：1是 0否")
+    private Integer mailSign;
 }