commit

src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java

@@ -308,7 +308,7 @@ public class ActivityBasicScopeController {
                         COLUMN_COMMENT
                     FROM INFORMATION_SCHEMA.COLUMNS
                         WHERE TABLE_NAME = 'sys_user'
-                        AND TABLE_SCHEMA = 'zhgh_jiangnan'
+                        AND TABLE_SCHEMA = 'zhgh_hrbnu'
                     """);
             List<NutMap> sqlDataList = activityBasicScopeService.listMap(sql);
 //            sqlDataList.forEach(v -> v.put("DATA_TYPE", new String((byte[]) v.get("DATA_TYPE"))));

src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java

@@ -475,9 +475,9 @@ public class MemberChangeManageController {
         if (!ShiroUtil.hasAnyRoles("sysadmin,A06,flwyh01")) {
             cnd.and("u.unionid", "=", Vi.getUnionId());
         }
-        for (String s : sqlCnd) {
-            cnd.and(new Static(s));
-        }
+//        for (String s : sqlCnd) {
+//            cnd.and(new Static(s));
+//        }
         cnd.groupBy("u.loginname");
         cnd.asc("u.loginname");
         sql.setCondition(cnd);

src/main/java/io/v/nutz/zhgh/trainSignUp/models/TrainSignUpType.java

@@ -53,7 +53,7 @@ public class TrainSignUpType extends BaseModel implements Serializable {
     @Column
     @Comment("本人纳入总人数")
     @ColDefine(type = ColType.BOOLEAN)
-    @Default("1")
+    @Default(value = "1")
     private Boolean selfAddFamily;
 
     @Many(field = "typeId")