Merge remote-tracking branch 'origin/master'

admin/src/main/java/com/huimv/farm/damsubsidy/entity/SysUser.java

@@ -99,6 +99,6 @@ public class SysUser extends BaseEntity implements Serializable {
     private String pids;
     private String veterIds;
     private Integer lastVeter;
-    private Integer veterId;
+    private String veterId;
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -158,7 +158,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             user.setDetailedAdressCode(paramsMap.get("detailedAdressCode"));
         }
         if (Integer.parseInt(paramsMap.get("type")) == 1) {
-            user.setVeterId(Integer.parseInt(paramsMap.get("veterId")));
+            System.out.println(paramsMap.get("veterId"));
+            user.setVeterId((paramsMap.get("veterId")));
         }
         if (Integer.parseInt(paramsMap.get("type")) == 3) {
             QueryWrapper<PovertyUserRegist> queryWrapper = new QueryWrapper<>();