From b8c8ef8441007dc8fe3be9e778a22b3e4e4cfecc Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Wed, 17 Sep 2025 17:16:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=9F=BA=E7=A1=80=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/component/ActivityManager.java   |  66 ------------------
 .../component/ActivityStatusScheduler.java    |  24 +++++++
 .../config/MyBatisFlexConfiguration.java      |   2 +-
 .../cdzy/activity/enums/ActivityStatus.java   |   6 +-
 .../com/cdzy/activity/model/Activity.java     |  16 ++---
 .../cdzy/activity/model/vo/ActivityVo.java    |   6 ++
 .../activity/service/ActivityService.java     |   2 +
 .../service/impl/ActivityServiceImpl.java     |  43 +++++++++++-
 .../activity/component/ActivityManager.class  | Bin 3753 -> 0 bytes
 .../config/MyBatisFlexConfiguration.class     | Bin 3188 -> 3182 bytes
 .../cdzy/activity/enums/ActivityStatus.class  | Bin 327 -> 332 bytes
 .../model/Activity$ActivityBuilder.class      | Bin 3869 -> 4050 bytes
 .../com/cdzy/activity/model/Activity.class    | Bin 9894 -> 10435 bytes
 .../model/table/ActivityTableDef.class        | Bin 4205 -> 4312 bytes
 .../vo/ActivityVo$ActivityVoBuilder.class     | Bin 3762 -> 3943 bytes
 .../cdzy/activity/model/vo/ActivityVo.class   | Bin 8603 -> 9178 bytes
 .../activity/service/ActivityService.class    | Bin 443 -> 471 bytes
 .../service/impl/ActivityServiceImpl.class    | Bin 3640 -> 5343 bytes
 .../uitls/ImageToBase64Converter.class        | Bin 945 -> 945 bytes
 .../com/cdzy/activity/uitls/VerifyUtil.class  | Bin 4940 -> 4940 bytes
 .../model/table/ActivityTableDef.java         |  13 ++--
 21 files changed, 89 insertions(+), 89 deletions(-)
 delete mode 100644 src/main/java/com/cdzy/activity/component/ActivityManager.java
 create mode 100644 src/main/java/com/cdzy/activity/component/ActivityStatusScheduler.java
 delete mode 100644 target/classes/com/cdzy/activity/component/ActivityManager.class

diff --git a/src/main/java/com/cdzy/activity/component/ActivityManager.java b/src/main/java/com/cdzy/activity/component/ActivityManager.java
deleted file mode 100644
index 049d97d..0000000
--- a/src/main/java/com/cdzy/activity/component/ActivityManager.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.cdzy.activity.component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import com.cdzy.activity.model.Activity;
-
-/**
- * 活动管理器
- */
-class ActivityManager {
-    private final ScheduledExecutorService scheduler;
-    private final List<Activity> activities;
-    
-    public ActivityManager() {
-        this.scheduler = Executors.newScheduledThreadPool(1);
-        this.activities = new ArrayList<>();
-    }
-    
-    // 添加活动到监控列表
-    public void addActivity(Activity activity) {
-        activities.add(activity);
-    }
-    
-    // 从监控列表移除活动
-    public void removeActivity(Long activityId) {
-        activities.removeIf(activity -> activity.getActivityId().equals(activityId));
-    }
-    
-    // 开始监控所有活动状态
-    public void startMonitoring() {
-        // 每分钟检查一次所有活动状态
-        scheduler.scheduleAtFixedRate(
-            this::checkAllActivities, 
-            0, 1, TimeUnit.MINUTES
-        );
-    }
-    
-    // 检查所有活动状态
-    private void checkAllActivities() {
-        for (Activity activity : activities) {
-            activity.checkAndUpdateStatus();
-        }
-    }
-    
-    // 停止监控
-    public void stopMonitoring() {
-        scheduler.shutdown();
-        try {
-            if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
-                scheduler.shutdownNow();
-            }
-        } catch (InterruptedException e) {
-            scheduler.shutdownNow();
-            Thread.currentThread().interrupt();
-        }
-        System.out.println("活动监控已停止");
-    }
-    
-    // 获取所有活动
-    public List<Activity> getActivities() {
-        return new ArrayList<>(activities);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cdzy/activity/component/ActivityStatusScheduler.java b/src/main/java/com/cdzy/activity/component/ActivityStatusScheduler.java
new file mode 100644
index 0000000..cddc2ab
--- /dev/null
+++ b/src/main/java/com/cdzy/activity/component/ActivityStatusScheduler.java
@@ -0,0 +1,24 @@
+package com.cdzy.activity.component;
+
+import com.cdzy.activity.service.ActivityService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+@Slf4j
+@Configuration
+@EnableScheduling
+public class ActivityStatusScheduler {
+
+    @Resource
+    private ActivityService activityService;
+
+    @Scheduled(cron = "0 * * * * ?") // 每分钟触发
+    public void checkActivityStatus() {
+        log.info("开始检查状态");
+        activityService.checkStatus();
+        log.info("结束检查状态");
+    }
+}
diff --git a/src/main/java/com/cdzy/activity/config/MyBatisFlexConfiguration.java b/src/main/java/com/cdzy/activity/config/MyBatisFlexConfiguration.java
index 4492d6c..712afa3 100644
--- a/src/main/java/com/cdzy/activity/config/MyBatisFlexConfiguration.java
+++ b/src/main/java/com/cdzy/activity/config/MyBatisFlexConfiguration.java
@@ -43,7 +43,7 @@ public class MyBatisFlexConfiguration {
     public FlexGlobalConfig flexGlobalConfig() {
         FlexGlobalConfig globalConfig = FlexGlobalConfig.getDefaultConfig();
         //方言配置
-        globalConfig.setDbType(DbType.POSTGRE_SQL); // 关键配置
+        globalConfig.setDbType(DbType.MYSQL); // 关键配置
         //设置数据库正常时的值
         globalConfig.setNormalValueOfLogicDelete(Boolean.FALSE);
 
diff --git a/src/main/java/com/cdzy/activity/enums/ActivityStatus.java b/src/main/java/com/cdzy/activity/enums/ActivityStatus.java
index bc134c0..007cdf2 100644
--- a/src/main/java/com/cdzy/activity/enums/ActivityStatus.java
+++ b/src/main/java/com/cdzy/activity/enums/ActivityStatus.java
@@ -2,9 +2,9 @@ package com.cdzy.activity.enums;
 
 public interface ActivityStatus {
     int UN_START_REGISTERING = 1;
-    int REGISTERING = 1;
-    int STOP_REGISTER = 2;
-    int STARTED = 3;
+    int REGISTERING = 2;
+    int STOP_REGISTER = 3;
+    int STARTED = 4;
     int FINISHED = 5;
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/cdzy/activity/model/Activity.java b/src/main/java/com/cdzy/activity/model/Activity.java
index 9e70cde..43c7f52 100644
--- a/src/main/java/com/cdzy/activity/model/Activity.java
+++ b/src/main/java/com/cdzy/activity/model/Activity.java
@@ -80,19 +80,11 @@ public class Activity implements Serializable {
 
     private Integer status;
 
+    /**
+     * 是否限制报名人群（0：不限制，1：限制
+     */
+    private Integer limitRegister;
 
-    // 检查并更新状态
-    public void checkAndUpdateStatus() {
-        LocalDateTime now = LocalDateTime.now();
-
-        if (now.isAfter(endTime) && status != ActivityStatus.FINISHED) {
-            status = ActivityStatus.FINISHED;
-            Activity.log.info("[{}] 活动 '{}' 已结束", now, activityName);
-        } else if (now.isAfter(registrationEndTime) && status == ActivityStatus.REGISTERING) {
-            status = ActivityStatus.STOP_REGISTER;
-            Activity.log.info("[{}] 活动 '{}' 停止报名", now, activityName);
-        }
-    }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/cdzy/activity/model/vo/ActivityVo.java b/src/main/java/com/cdzy/activity/model/vo/ActivityVo.java
index 0ce3982..9be2527 100644
--- a/src/main/java/com/cdzy/activity/model/vo/ActivityVo.java
+++ b/src/main/java/com/cdzy/activity/model/vo/ActivityVo.java
@@ -73,4 +73,10 @@ public class ActivityVo implements Serializable {
      */
     private Integer limitPeople;
 
+
+    /**
+     * 是否限制报名人群（0：不限制，1：限制
+     */
+    private Integer limitRegister;
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/cdzy/activity/service/ActivityService.java b/src/main/java/com/cdzy/activity/service/ActivityService.java
index 770dd88..a38767d 100644
--- a/src/main/java/com/cdzy/activity/service/ActivityService.java
+++ b/src/main/java/com/cdzy/activity/service/ActivityService.java
@@ -15,4 +15,6 @@ public interface ActivityService extends IService<Activity> {
     void saveActivity(ActivityVo activity);
 
     void updateActivity(ActivityVo activity);
+
+    void checkStatus();
 }
diff --git a/src/main/java/com/cdzy/activity/service/impl/ActivityServiceImpl.java b/src/main/java/com/cdzy/activity/service/impl/ActivityServiceImpl.java
index f17e0d5..37417e2 100644
--- a/src/main/java/com/cdzy/activity/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/com/cdzy/activity/service/impl/ActivityServiceImpl.java
@@ -5,12 +5,18 @@ import com.cdzy.activity.mapper.ActivityMapper;
 import com.cdzy.activity.model.Activity;
 import com.cdzy.activity.model.vo.ActivityVo;
 import com.cdzy.activity.service.ActivityService;
+import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static com.cdzy.activity.model.table.ActivityTableDef.ACTIVITY;
+
 /**
- *  服务层实现。
+ *  活动状态检测变动。
  *
  * @author attiya
  * @since 2025-09-17
@@ -60,4 +66,39 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity>
             throw new RuntimeException("该活动不存在");
         }
     }
+
+    @Override
+    public void checkStatus() {
+        LocalDateTime now = LocalDateTime.now();
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                        .where(ACTIVITY.STATUS.ne(ActivityStatus.FINISHED));
+        List<Activity> activities = activityMapper.selectListByQuery(queryWrapper);
+       if (activities != null && !activities.isEmpty()) {
+           for (Activity activity : activities) {
+               switch (activity.getStatus()) {
+                   case ActivityStatus.UN_START_REGISTERING:
+                       if (now.isAfter(activity.getRegistrationStartTime())) {
+                           activity.setStatus(ActivityStatus.REGISTERING);
+                       }
+                       break;
+                   case ActivityStatus.REGISTERING:
+                       if (now.isAfter(activity.getRegistrationEndTime())) {
+                           activity.setStatus(ActivityStatus.STOP_REGISTER);
+                       }
+                       break;
+                   case ActivityStatus.STOP_REGISTER:
+                       if (now.isAfter(activity.getStartTime())) {
+                           activity.setStatus(ActivityStatus.STARTED);
+                       }
+                       break;
+                   case ActivityStatus.STARTED:
+                       if (now.isAfter(activity.getStartTime())) {
+                           activity.setStatus(ActivityStatus.FINISHED);
+                       }
+                       break;
+               }
+           }
+           updateBatch(activities);
+       }
+    }
 }
diff --git a/target/classes/com/cdzy/activity/component/ActivityManager.class b/target/classes/com/cdzy/activity/component/ActivityManager.class
deleted file mode 100644
index ebd822b4286ff29c31f0d0da8a2e571fd3f7d35d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3753
zcmb7H`*#%89sk@snC#|4Hcv#2fF!z`0E-CtSU{4H$l@kaHb9NlcCvFxhRn{avom?v
zhwn$J()t#m)!GNvVk;>IgXi@0=N|tJ=;^=U@w9&L%<S&0Sp?ynotb;T&(HV!{oI>>
z|L^iY0qnuWDC$tJpn;<is~BP@)LAuYsOD7i;mH#s=P<0=t(&^Dm!UqMI2uJ0A_}4$
z&EO2TdE&048_Aqy=3Ltrrjs0=7dh9l>>@*#Ddw`dX`#7>(8i~2p=yUL%V5|ZPbV@p
zwaelqGg)EJ>N$~$U=3On#5h{f#?YU$^2wa`<U&%-Ir^;bEKm&jf@R7O27;wg)l{d1
z%@8RDQP6wxdpcIo!O&g_cEGmPg^XTwqG(6G3~MdNO<2be4MNcc<sJ*Uk<zJV+=5#b
zbaUK>^$cq&7UebptZEuVXWZ8d6(N<FXrpp%<hUK17#bWQ#kYk8GnP4(3L|>lH3<XD
zOdhg@rsq^gc>a4i?!cW4O}5Bevm$+*VPjy&D`O2c>6{_K(T9Et(soUTp?Kzdz+Vc?
zOX;v{n(Cw>>$wG66(l*f;Vy>m3LK$c8rSpU2=yO>GMXMcGCrJTSRVqmhA8EEH+Cr4
z$*~LfFl?!5_*!j7l`gf)fHR`c3+*sr$M9Gf?Q#wW4_+sha7jY3mc5U-j%)j+xsT(1
zq^LByBW#uChsGx!)=vlPl;9rhRqz1EJ`6ClRT3<T5M0x0aZJq1wu&bvq{a}(ehgFl
znBH<n$#%HW6g<eVVP$FamL`nyR7Ej@G{-^77#%cMxtRe|J5taHsH~$pZc$bs!!ara
znu^n|qgiuiBek&n*C-4B1CGP8>PmKa=;5*bS*bD3aRf(caMU?fcgBUC*G*OSFvF(!
zb%CZF@5T=~9>D}dbIIwLHAeuIQuSKgn?(gbD$$phf7&E)ZMWbEZFoK>3es&9kK@M*
ze!`(*vWgphCSzC~P+sY~8dHBYCCz9YLV^*|OMW7l!n6XN;{;}^jAs{$j>uEpESIX+
z={J~e(IAs@)*%kfr<y<lomVe@apmMk|2gy8)l=uLTw1*H%-O4-d>Dm=f`TVFY!D0i
zyj87Euot8;gOIJF8?vrT9wDA@hbzy7S%!6Cei*V0gN_A4$CDbtJjVi_Bq*kYQ)1mT
z(O4OC4_=R+qWBqpuHY9OPgVG@yiF&Kc*0c;iaC<ir>OEY7z{f?112lCy9V)8cV}uZ
z4N=1obu2?mMmNQno1YZ+xFj8lD`VwU<EU!u@;g{;aHe(gyQPNhYo00Oq?ri2lruwb
zEl&JaXbEcXrr?lRV7R@8!*6L&Ym5qK+R_fGwwf2zr4;BIpS>%-+r#YSp9SQpbQ~?n
zf&|A=8E=ZerRb=(GinjPTC(tjjz7(Y5t#N4veh)yxtUS55TLcD=valY79(6Y_;tGG
zFp;}Zi+FZ-tr*K2EbdxE%};7-Pc;fX+ZcAPz~TA`Cx|biS<AI^VnmlM(ow=SxIJu@
z{7L{0T9#9EY_;GQq}Z|wzl-91e4ya>93SEjR8WtKJrHzr)|wH?j29|tsK=@9mQ7V}
zrZQH(z6^&PDEST!sHSF!Vo%1hX52z51aL5?p_MAd@r8m2i{JRB@AA8KgCi-N<dA9@
zSvs~-F{~$4{v4${(K(KHaXN;-+~8zP#IUNR5$C1uCmgRyy5woo6!wsz7K@^&;8QZS
z0^nL$DOjvx_bLDaScz|ZV6lNb*3rRKhc<b&q_;MCouf<7)86Vcbm?XCeoVj5(#ja>
z=?%E4?-E#F!{<;w!|J{-(Ei9Jbbf}e3!c_<^xK98`fa7(HgKZUwdla}w8DLTynq+!
zi{T}_Ox~sK{q&Tv@V<-a>R-mqbvRbBCvWTImoDGyJUd;!Y+y&){UuJ4y<d@3Bcl&#
z{1v=PV$yh;p3*?8XZ$iHj%D=J@X(DI-BD$vzK7PbhgO`zuPYu-kqE<Y%FyhGLf@oD
z9#;2VMjVJl7qNL6+m)4xY(gjQ3<1&=xT%xXCp$9cS$fvfvscEvjC&a}1j}xQ)99d=
zL56=}WOVZq4xIb{e<f1&s36~uZfwRzx^MJgYdN28s)xi$LeU$ze4XB#QTH{X3if>E
z75|NL4ChHf3J=PxmhljSeCfd0A`UGh+kp2dS#RqY!?APd$W*>Q$74&#E#i2au>|u1
zWfLK%aXcCXdIx<2+v#@){dusH_U@<Mdyv4rbf3A8{--d2-R0mDRGK&OmWT3SDEKDS
z_YNv}G)6mbV}jz9=<NzxmCNp=pt>%>`IOe{Jdh;Dz`jrgcwq5qPv)IiRL(F-Nn3kJ
zOQI0zU&3795`KE#6Ow5AhPul^l91OYv_)@zPu3Gk((xIbrKjwx-%@aY#Gmky_x3UV
TijVO(+KZCIzvBY_fpy;ijDzaA

diff --git a/target/classes/com/cdzy/activity/config/MyBatisFlexConfiguration.class b/target/classes/com/cdzy/activity/config/MyBatisFlexConfiguration.class
index 693c0a8909eb18a2a3c67dbad08af12fd493beaa..48098cf79a95fc3d07b76703121c5a9dd1c43b2e 100644
GIT binary patch
delta 29
lcmew&@lIlcA2TPbZ)9+w4<m!>#D!v$?U?yCH!^?b0058n2|54(

delta 22
dcmaDS@kL^TA2TO+fPZj^dys4V=0IjyP5@gG2G{@q

diff --git a/target/classes/com/cdzy/activity/enums/ActivityStatus.class b/target/classes/com/cdzy/activity/enums/ActivityStatus.class
index b3ed6c2cefb422a2a0bb5baa58fa5ccb66d04285..af4a4dd62f78a2059d6fc6d5438345c9d3e27871 100644
GIT binary patch
delta 125
zcmX@kbcTuR)W2Q(7#J9A8H6WtHE1#enM{lfyul&<0r5eu?w-LRu0bF{W=00~;1I{4
v5LXuvmu2F*7+Wp|Nd|5PHU^*+NE-tWkk5<6=L7Qjk@x~YRg4URV6{R3tN0I-

delta 120
zcmX@ZbexIn)W2Q(7#J9A8H6TsHK;H$@CJwY2gC=tx_btPxCSu;rI;8Q*n>kHgF;+g
tKwRdDn`3M_7$h0E7}ywqQXmx!+(14L5}y~y=R@N21646H2!PcJ0sw}a4}kyx

diff --git a/target/classes/com/cdzy/activity/model/Activity$ActivityBuilder.class b/target/classes/com/cdzy/activity/model/Activity$ActivityBuilder.class
index f8dd2804f963485d3a433b5c4fddc25009d927d6..faedb555d1f0ec118ba7b73249be5f7b62af43de 100644
GIT binary patch
literal 4050
zcmeHK>r&fB6#kX~21f*Q36wMhC=S7dViHnl>p%e$0<9r5rle_l6ZQ@WY{?@Dru0er
z80}0tnMr2)0DY)V&skkiKoe9ZKl@{S_FVQmtG%3W{r5kw{{k=%J&h(@NugOo3t9y-
z2l}y|uj%Gq{>kovthfTL4-M0B7X+@1=XToBhV~TF8m>YUn66m$e5Ly9NnWqG#<Ag^
z<m*;d*78ffnhiS3M@FqGZGm(Uxn8AorPF*R%iJq4{xuDq$Ovdb<fdMi0^O0=vTGZD
zbhm~cj_wGei`KEU8Rxo&KK675o^r!79ZUH>&@jNhp1`*vor-NVT*ESX?1vg|vOg2}
zOIAe>oVPR#VOZe0E%yw^wUwjn>bARW@Jt81nYyIpd0cHpcO|>j=Y6DMlt=eOM?W&F
z9Kfk>YZzmHyAvR?bzDP^ttojLc~`?EKBgV2>%VLs)d@1PMC+z2_oS^-<~2-n;MJN@
zH{300HEJr=eGM}TfKs_f4(Itq!z`ORROnOnfznRlQ-R@&Ham?ue9i}{AjIH!WG-rJ
zBf7tR@7EHu++KqB=uj6USlP(*|C=ed)6JJp!vek#=&$RCvS^ufzMdKGKJ{ofOxF=&
z>i;$L&T!01=OQ-$I0-Ztsrb-^FBzt!3$ZKhZGE?<Y6oA#9o;rq_l?c&zTpVmFI{x5
z&la(Qz{<I;$z28}vmxDmtGcDzRN`D|({xs&$o`jI3VXu`iaGw5!h0N@Sa9Gkh19ak
zWFU|ozj!#Ub(?E>>mbleBTgA3-1l_ZI<hNr)!@DESn|1NiX&<GrgYpj%ONVuEL)cA
zP{D3^>+W>6qMXJyzDZ$+uj4bC)G5AU9$SYp@1^l>=qmAnWuFNA7F`WL&;wo5&1y|L
z*^*@)9yJQ*=NqxSHE{c+A!EW{MB+V8E<_i>hbZc`TG?=Ap$*T45aAjG9iM;4Y5t0*
z*Q@hlayZbKVWYa@(5S(u&ZsHEm{D^;lx&MKTsdH~vkss7*i41b<4{(7qT{Z|Z`_Lz
zm_LAcD|7^OH7|1Xd{{S4X%}m{<4C$!oo7}eg&zcNpWE!XJxt*zfm`nmB^LHJ93#Y{
zO;q2n(JwucsMo~r871kZq9nabl%zL^lJwS4lAaYx(gQ(BdI%^<)UPDby^_S{N)mf3
zNt8{piyFP+Ah1ZiJW0WpiB}MRP^Sq?^viCZ+%o-YUI2<%A&uS#ctlZ))Gv_ak4R12
z{gZxvr|$XTeO`z^oPyQ&QVFBz7DmeuW+xs~*dm$U!t6+l$!iy4dP+|`W>;cN-iHv=
zQ~KgDdlO^wo`#s7G7yj1pBR(RM~LYuH{&sHB*x^k7GiqJ5Z2=MXfQD*pW6^~NF^AJ
z#~ewF$#)>c995WO@tE1fn0%i?%rS+Ti^sf^7?ba2h?!HElUR>i&xypCe9uG7NrgEb
zk2#eXlWRtZIjt~f;xX?f#^m}FV$LYc*?7zci7~mBg_yGn^Gke1Caxg|N(UC-VD9<E
zODat-(Lt??S}(PJYB#72QX8R`rFMtf1hpw@_ozL1h0o#(npY1O!+Kc4hM#wzDyE?P
z3pD;xIbY);@UE;2e%5AeQl2I}!IqM9_?l!JWq(TTTYN`aH~HJ>&(;gH<9qywpE2++
DA;E%`

literal 3869
zcmeHKZBraY5PpV04lavafPmx;5JEVD90~ZwK@^S<(1W0d#2B?|xf@}_-R{-yK#9M^
zpP^N;QWdN61N=4q0?Y2%7gpGUmC8py%=Ywj&(m`~GyTl{`S<HL02c5=7A?4xL92l_
zTo%Z^Fb~Z_-L!WLPj+6&suH+7Z`qc5C~#>!zukd$bYze<a0Q0Ibk%7Ts<oew3T9PV
zhn6}jG@P2O7Zw9`H0&%LSoNB81+t;%T8+Y$kK>gcd$-8=?-=MpPQVB~H_V0<=#KeT
zlxqdv-3EHtyEF7IIfv3^oNEU9*wPhRDow}s9Bq5ozyRBNLff+Rs;<>kmSgkW8wPH&
zJr~-`PSp&Jw+#$pNZ^_)cP&r3+E7uZtF|m&>43jdMM{C^)t5~r*`$Bodj>{$c29iv
zBfG{99QuxdF}8PjAtH~C8_4r$Mjm_KGcbwwX@?r-Pa6jff{dkT%~o<(x;kXRz%)Bv
zsap+8ZAzzE*P$L5n9%?fN*#C^d>}A%-j-%Di;wuYd@MwEJQh)JU`!7->FtgrB-Ib_
z77hCNhxv;w|BRvhb~oLpIRiz^3-mY4eOYpBIx<f!wMRWlu&q2HZv3Ax|5)Z@c?}MV
zKx>JL2VK~*WlK8HJJQ`Uck24?^EKKwU5oW#uvP6@p1_0hc_;Q{5h@BSpW27~MPPF4
zQtdglP1B_krKC&CS&1VDzwAQT>j6;0!M+gQ<M_hDqkJKxwjD0!0;A*SPp4eBE62}+
zKrhWWuK3ZuXDiNuTa_yo?{(*5z#UWUNz*r^r&b-0s3^DOILf1f+w}A9bzR107GL74
z3@Uv0wrEku_?CU>?8|~5#=nj$RL>pvNZ^-vHUdW<bk($Lb?J?k9cTZbSv<Yo*vP*o
zZXGpcg8TEBzt5?~coG7Ll3A};EG3KW*cSLJ%0bu(_;Z}ruX%Q@wjd^lLX8<Ru4@jA
z4+PW~ABr(vd^jXJ9*Z+nC1j(MhJd<wn5vx5fvf~X#a*ADxECX!U;^>Zg2)rwui3VA
zOLf!pBweGf6F)qIZw2n0+S{Zp%iueK+h@BHY5Mz%VItQSs@<LRr8f=rTKM^)B|R*(
zq-TVd^kmSIo(5XdD?m%)b1jLtwIrt2lGs^GB3~_uY)SH5dTc?^`wJ+L6g)EV3gS2F
zwBR9q*$i69r}Q;^2YiM_(ul^fL|#0(NRk(ynYi~meSW3x>FIsGOE8_B_3soYk#`%T
z<p{G2%j9+nvokd&=PbhXm7ZkGtEn+L{}HCI^d)2VrpDyGj4*v=AQ`hiH71{n2-8<?
zCSzVtjmc*$!t|9vJWAT5Td6VmyhfOVI>1OW=5T6EKKl{oh{haC#vDzJ$@eJ29MhQj
zWX!v%G5JnLn0bvkiIt>$PNc@<`yF9UYRu_m%&F9vTq`2XX^lCPjCnsbCfA(^b4Fu6
z#wrc*egBc}z92dO2WFp5yreSn5}nkpQtPGGPwhIjThxZBjZ(WyZGzeqwfnE|VRGT|
z>(+c!x7P4^5VJ<*mSfJ*{Qn&9H9i5(iZ~ZUY{eH8qXlKGYdMPzlI;}v3AL~Bl(cTL
Rx6?nGZ_t5fc#iKe@DFD%U%LPR

diff --git a/target/classes/com/cdzy/activity/model/Activity.class b/target/classes/com/cdzy/activity/model/Activity.class
index 43fae1aabffd7d84cfd5a032251b29928ec0b33c..7e41bf17859de25a4efcb6ebbb7fcdf66577e203 100644
GIT binary patch
literal 10435
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

literal 9894
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
b=|A}VFK@?yPMX}pvX@C4-{Q?p6P*78og=Cl

diff --git a/target/classes/com/cdzy/activity/model/table/ActivityTableDef.class b/target/classes/com/cdzy/activity/model/table/ActivityTableDef.class
index 2a4edb7b1285caf0f2dadbecbfc5e2915a7ce2a8..ef83527e4b1838c5f0edadf8c285969c86176bfb 100644
GIT binary patch
delta 1235
zcmbV~TX0iF7{~v6&gn^VvQ5*JA$D2>r^BeHRT-HPXTVDcw@A`DO(=wFPh$-<rA=zi
zX%%k)k^8l55fv0KpyIWi3UvzO@BlB)@D2{c4Day73okN$drk|y!pnZU-+uf5{rB6w
zHSfw3#y@wb{s!<8#>S2P%BoO*VW8kx<^0Bi?c~b=)Zt~0R}f_gB@?Mc#%f=_GLg<K
zZ}%g{5YF{Dh2es;*|G;qMZ4r4h;u9xV@mXe6%4ia3i?YuIj2x6O376m2`O0{i)RuY
ziA>f?w#8$aL|dyLtHpmxgO=iG6^&{GdtJP!Hfrr0X|YaiY+Az*^~{xBHOqE#Wyf*~
z19>UDmSdebsy_bYdIo07%o`kUN>nhGOj_}_<eF4#TIMZ|Zsf!@b*bLN5y0Exx;}ek
zFfuYYOLS|RzJX&SdPSf1oZiQ=3H{=Pmeq?KB@BwY+N*k*!-gZ4RrQ93Io`#43`)*s
zboCp0y%_a1&ov0sBZm(p;6n!Wsi!+6`(us@woJ^?Z?e#529Dx$AHI-~FGbXU@v-An
z$)063I=(h=0^j)XEys8Ge&V)YW9*c;6KHArQR@E0aR3Ly63r9EV!j;j&)Ig~_Tg8C
z`C@AzD!Pm?`(2cbg}z$UOR6|+49%yG(3{uF4p8)gNq;nM1=x91(G09rEDl}{pF=Qf
zMzWKrIfG6!91;f4H)g}t=AY<DpF!6+omcP)jjtg>V~5zrmn_1+NV62yVjHEnCx=h5
zg;t8}HH{K=l~5YRl-b<!%p~3t@!+M0CaxFHhn7@um551nx<u1cohFh#wqu9uB88na
zQzR3+Xr^K}d8$^a0JH^4(w=-x&msvbR0PzUXOVB7LIFs%P#ggM!aEmGH%6NZDzXEH
z6h;?<uv{DSypuCFsQ-Ih8$pDy*R>(xRgBUI#|XM_8oGd@l+w-Svl#LS5}?aF&~x4E
zDrLN`R%VpKp3?qDR(e3lkiUzN^i+t^Q%OtJ=TMi8u!w3-V)K1x70;S?@7Z3Zds{k!
zY8-O!?Z?Q>FGG`C0|cesB;KFENAfE%_bYi~0czi2$|(>Sr5K^v5vn+buW08ae!yw`
POnHNHzF+Vg{y_cz4Or&-

delta 1133
zcmbu7$xl;J6vn^X;kA9e#mXQyM1m5d7Elrr&;$oW(1uYcXi+H@s#LMXzB&&$&nS4E
za6rLXHxMEiOw@(CFwwYVXWZ+;KS1NTuYl2o8#njfch7fz-#O>qv6<g8)b~F}UjkT+
zr-N#z!Q~7z$3i<pu|0mRJrdR;Q5%x5gk!1rY)H*7VwgH9Xp1xlVxdS_DvCK)AeEv;
z#a>Un$LsT#R}~j|Jyn%fl!|O)nrRh>N0b@Un#vebqQT7}Ef&?&{lRdHKNi{+l$;8V
zO36v7DOu^M_15SJe@W#Ezt>YyVnsDW>L1BkED()Nrq^)Pig(6zM;!xmOW+!gwc@)m
zS!v){hxNj4T5fCPu))u;NE|l1#DLY@{ln7To~){*4{&Tmv*<A`P=XwruvvUG`IHdH
z7Hkzc=4Hw@jxZuZGq)<+Iik?S7jt!5qs-kYxw{yQbLZ7d?>!uQv2Unc`N|TyRa}Iy
z;F5%17NyoV)31_}&1X{-^r*Ow8y4K;xP{)KSvC`6cf=euJF{PM?{b{R87DLb?g@v3
z(c-p%rUf+%9x}`peQLVsvRaH5JQlrbp2Z25^c7?3jv3T4{ag!}tc=$E0PBaDPGAc~
z)c(QXbciY*OnwI6ASn$vKx-+c(z;rF;)Qvv05v#BpFEy~4(!u~G(wU~;41=}XfJSQ
zW#^1wgV<|-`wwoN=t(H-VEL%mx$b!GIF~3mgu}X50glkgAjvpNCnJuLv%^RNPzZEM
zG5HVTh0qT+kO*+OhtZTZiWZ<EoAy@VIoe($X@G+97CTf4h7Wc$=w)QYGbhTR86MZm
zup<E{^fIKmnb9?zMPzz%+%%VViBjBI!)X8QpvWF*^pmrLG7gs@pCmcsq*MPz8V9NJ
zjgaMjk?TzDi2Yqhyvb>Lr4GF{Dgq9i)tj{9+{E)hrmg|(FOcLL!Hyy9mM??pFC*TR
njb_zJcLtot1=<to)J2LbxJHrN=u5;s+^2v_mk;m=PvH6mz_QT(

diff --git a/target/classes/com/cdzy/activity/model/vo/ActivityVo$ActivityVoBuilder.class b/target/classes/com/cdzy/activity/model/vo/ActivityVo$ActivityVoBuilder.class
index 9b403928bac14a4e098d32b8955988ef9d02e31b..c68493a0665a345c07230d139466dd8964211b8a 100644
GIT binary patch
literal 3943
zcmeHKZBraY5PpUL2bV>Tmw@DrAcSxPSt4i*2T?eJV2%sskQk#@Eq5bqxZAzjT`2LF
z_%pOBR;pr^Kfu3am1Xzr%dOrPwHEp4hq<2V?s<B4rl+5|KmL02JAhSumqiCIWzeai
z3*7>_m&U1~*A44Xe{%3rRy~3471J`khXR*o^83B$L2m|G4VR$_+^^aVy;}S6OgE~Y
zd1`uRdc&^Cx_)ZwYk_9po@#a1Pt1BvIs(~n!gh_KmRey;wslzGFz;ySM@~QsJ<CQz
z3Jk`4E1qKp-h&#3*t;+EF50KkVVo-(M%dCHS}IN3a&2XMSHl?FhC<thbgPcp^i130
zxz{vYXL~NRm+Yz$8gFVC$1Q;?jyyD7&ryboXE@%T$txZ6SL)F~=Xv!F!;@@MpZA`I
zNuE6vpZ&<Hu>*&`tznw&y>5ue+8GUb)@EeO^R9+DyiW(!Fn%bXGzc=bMcbAq52d3*
z>KYc<@p9d4nBK0mn{^fH0}YF;?^F7x>T9Hv!G{93Qyp*?OSsP&^sx}xnOJmnn6Yti
zU~gBGu)%(Sw`fo|BHYW^^3PG__Xp{UEo&%XMPRgH9Lu6@QTjYHy(8+;xmunp#I^r7
z%umsLY+r*!5$G&ZJ)z56GA&8TeIT7Z<DjnU0AHzn!!darC_B9)(-nA7N|m<lb*Uim
zxa~Od7eLGHNbkt5?HUdhFHbtOxSe=_;5#o8VlTi;$o7lCmgCC|)BGZUT?btI1@bc~
zQRpywJlo$Pfnl1~Vu>g}vK9Npsme{0bE1DO;+%Q*C4jPYy)D}%9?PxUw&zlrZu)29
z_IG19i!bmrg9_i$J%OoK1k*aTkEQMh@-OZtv4HKI3H%h_o50Zr-7>6NUAj{x+de*N
z7TQ-F)BI!N-dR&7xW9<``-EJGZ$ki4H0t$=>B&M5_67co?Lw;?Fz*a~gCgqf+Nzkl
z6^@u&<7361aYaCyaaD{f<LZziSr_NFh#CKF2uP3B5!dk`pg8XO%*MSKbw$IFu~tQ%
zo(tQSC7oj3a9v5aZJ=!jGWeQ!t?i(b&M$*+1a6-1O1$eIHYSLlJE-LM(J#G@sMo<S
z7$xa#q9naUl%!XOlJvSzk{%LD(vv_*qJAZb?3E;fSCaT!N#bjgJeQtr5cHA*bdrKK
zv#%k3p-u-L(l47q3;Kk9HQxcBVvR=h62Lln@#F$YUVLWu?yvOoGj-dikN7UZbaGbT
zDNrQuE=J1{W<NH_tqrp;H74&_gy|24k}(HTWAgq-nEqfS8FM%_CZA=5=?}(|F-KEl
za$ZE3{@{8t=GD}goMREDKN!cOq%*pa8k6%i!W>rtCX+EIQe$%NN0^feb2=GwDm5nG
zqX=_aVdj%D@1(}$I~if-73Lf^llF5qH74Kh2y;$hE+k{lr^e)35n(PU%*ABPd#N$G
z?nIc23iC5;k&5s8_jLCK$(7%*^nCUem62EIqc%WonA#|{tJH2#o1ivD?GCkBYV*|Y
zy~an$g~zX3D^cCr#^*uI8kJj)xlHr_bG$cr0Gt<bIf&Sa#}uOjCG04<gfht<iu{Dy
Xmv}~_L9+MIAEB?%i|2TOZ!z{a^16G!

literal 3762
zcmd^C+fo}x5Iuvz67ph+iy=6+F#%(Q2@APkJ2Fl{m_RHri3pD4mn_m0tXb`<b{8t-
zOY#{>l~b;As`3H(l>9*6Qt6((XcKL@Hih5vFzT7^p3}2EJ#$9C|MmJe04sQ2Ko2hD
z(5s;j7X?Z$j8j9m4Es=ja_~Yne1VG(OxyGy3S5{i@Ao5*{u~M#E<qEx+i+TXqxr*`
zZZv%J)b!8vmeZ7$e(LC}p=RHi?sV5qOsgqffkHH4t4UF7ov<~>KCEz<%NmL(322e$
zj?t0=LkZuy@0y|akcMIQ9*DfF&Z%@6=Zc0=wiF{vz3teZqipYJ7-!pXWLuYB!!_H!
z>DWB?T@BaRUW)8Br(s0K8yY5XQ{aj#4^7W^m7(q%uD@sUO2>nh`ZUmap0#fHl1=LK
z-qSF}vxk$jAK6WI;Lx`;%&@)Rix62mtD(%=oa}hs(J+tqX`@=k_d6#of=r}n%l74=
zbX7=Q!y-Fgvdot0?@Fg_$s9fqxRq%e3s}NOTqhq3{5hM5p|&hB4!7m)YEse|1bB-E
zRrgWG63dTN<^3T#HFq`K!+n9VmT@erj!hNu)bx+2M_Xn4o)G!}XLb@93rj$tw@UW`
z9ln}rODfI->FyZ^mO96LB=!y0<Z-C%^^Z(X;C?MrL3ZCO6@kZHxi6mst+XxuBd57*
zxODmW(xt_1Cj*4vd7cn^Azn%yp9gj)xy-nL&ykA01HQWj%Ci}lMVpcLoghO3BQ&jZ
z%g6Oms5>WaLvEN{6UEh-GZxsF0CuG3Z#o|FP-)F^e2=c#cCaU2@glYh*uj$=cKJwt
zDKOoMVA`k7vDAY=!71IKTikKa1b$5BCUguyHx0XKNpHI5IL9aLO81Hrntx2(J8R1n
z_vZ=!fKV&RG=vaU!?Nn8FDrS}1^!56q0<eSbC$kA5$#rUMa<ufM$C=Lv0}fZA|$<}
zD#3M0bwqKjOL9}pZ2vZdq{Zr(t9TGn6n6t=;$DJ!Rz#WDeap6`TeS?&lXSQSyFNIF
zr$kU)`<k|0IXn}%@n%<|$zX3WNp#vn*SSW&^q8Su4?j4Rq^E?E^l(s;9tld)V?asb
zeI<#(l_aKClDJt(;$tO=Zb=rY(d!BVpHNRHDOfZ23gTz#^q@k&Z05y0P`}E7-e(VK
zM1+k`$%`jfNb;g{b9a8BpP#7PJ$*EA38#~@`aXfr$h(ixN`zU&D!FxG4rIpUT*a8d
zU^pFfFf%6SJ;n?Mqv@C<nK5|}W6WSMo{l+|8I$WF#ta76(lM`Q#^l<HF@wPb*3$Oq
zdS*<n(-?C?1(-_5oXm{LH6LS6Da@I4%<0USe12lg8HHI+$Gn{xlh0y|Syq_ysHWv}
zE;A;d>lkxhVJ@a)E@Z~!J0iwhRG8~{L@GX;2e?c<;NGuTdN%ixj{HjuP#dH+LT!xN
zRchC%O;VetcAMH9wS`ysF#Uqi0?hb+*}&&vyzl4+;&{t6|3Afgjb-3X(U!w#z1SrD
k9&F(YC71A+WS*kdsC|V!8V!*>PyaT)MnCrP4Zg+r-{bdLEC2ui

diff --git a/target/classes/com/cdzy/activity/model/vo/ActivityVo.class b/target/classes/com/cdzy/activity/model/vo/ActivityVo.class
index c09666b79782c67edee98773b2e508d661a99a10..fe41a723dfdceb98e6e183c9c682baa7534307d9 100644
GIT binary patch
literal 9178
zcmd^FX_Q<=6}~mo`@CLepEoms1Ue+sS%yFWd6Q_!1`}t(m<fY{i0RC{%yiPzJ#_a(
zf(ssTR|EuQ5pX9iQQ0P}vZ#RKuHXWSc#ePckH0;F@w@fvy{_)OgytO1@rOB6^KRYy
z-COmlZhcktCeQunk;jQ>J^dv{P1GEwfI&eD2}<qH9?TBrvxVuwi}&ugCo6(N>vDx$
z<*kC6mk&%tDMHaO#SCg8L(tO6;_Tq$)YXRuvy+wF!Cd9g;B0Zq&JP|e4ql)%6GcHW
z*E~FhHb$zAj1&vgLmV_=P?A!D3>UdQJ8KJS)3D=}Qcj`U3~Fa|+(mCH9<)mwr_-P=
zwj^E4_*}72E=pUEK_=VUUE5~6JXy-kRdU4w`}P^s&-RpSA1O{|UE?VRol1)Zb(ZYu
zT)9$`hVe?aRN0y1o|;ZiE2s>zUw(78VzWuU-f0G%&fe|1_m;vG1Gwp>2A#q7XxWX(
z+T{ifur_R0kt+;ZNvkj|v)QY*&(9*HHbldPial+YWRrsioyowKd~P;Z8MBLXdD+xi
z2A$3NxYX~EZ)2CjbdI3&8k)}Z1>VeVoX_Q_>{5)@QgaL)ev3iplO-rJnJsL&az2~K
zcrDlZ=j7DTz-0_xXCMKQSMh1P;)dk>Xj?v@xyTIREZtzx1spqMbKo*Z*ksUV+JaF-
zgi$pdoi*O>fH3+(gDzrp0_c(In6PP^L2qYM$~C#e!p2d9w$sH(DXpJQc6QXXrSg+q
z-eJ%VcHwyLtH~5)<4%JvVPl(SR9VXAOAUG_o4Yi#mZ%K5%%IB|(yl?=TxI*a47!5e
zEvN@}=S_}F*FLxFJ_*YqvIgzt5ZntrgvwclOc`V|!~n!w2yB=(Xod|j7(9Fv?KkKE
zAtNF)+49UL(1fIv;WiLa!Js0|3F@BB9<VnR3s`oS<|+UcupSDPvJicG8p)i{azu^%
zo2&5|7^i_Z(IAP|%~7rUCsFBZ!^^l5mBUmqXr2yY5R0Yh!E%1z+WjD+Y0$w|@L92R
z$XO?j3e>F+=%#$OTpk)2srQsba+N`c=xR(>zBtW{d>klD?-SG^Nj+B_9JfokY(95&
zc5fatoGQ!egk36wWiJ`tEJ$p_ns=vmBAcJLgGd4XCxnRU-TJ?t=LtapXO$#Jas?Y)
zzt=A9bVe1EfE{Kci;>1CD`lWElPe2aHqsD_4`FUb?aEAXYAjpAUR%KoVW-*aFuI^2
z5JW?Pj^7RtI$o|4A9H&9anm}0_e*Lhhf!;G3zgoCL>ko+DH2grDf$FmX-bVW(E-ii
zQY8oyTAkfI8WYs7dhD~>xkKEL?x}bVYzTuECWfkKi=yK0Q(gLqxa*xGCjip6C+FRz
z!fDSgVF?v^Ay$u3YF`x;ELLV1kmOuQW8KR`nLKq#OO2{Ug4}b2;Q-ufN*d)E!8tn!
zYIP7by0$8;+P!uSSk<=H^hurXYI~)WH9)y<VghTCO50Hb_0piT7VPPJYTz{qV%ECU
z*g9+6s_D~J>r*xKN{5pFNwLrII)T;cqHgrkM|IKHmXIxCw{*{=Nv9P}V@QbY93`<t
z9YD2?tereCnw?X05**txJc=`s7{-~aWS8gjxD2$^Bv3f*W{Z)o$%=$i-JuSbXw36-
zra0l%)kLN|g*RCpo~mXtT0M1jyt~r+plHjlqsHKkWGt<XOC;@$L8MZ2NC&5sb(48@
z@rjKW=S!3J)*NqWN%uTAQC!Un5M#34E>}ivre`o{YGbijDdT=H=df!z8KPgu=r{D+
zFg?%5oEHS8t1CBGI9NPj4?3+nCm(OSzE!6P1$2U5lr2o<?Q(jgSUfO4H>5Fv;!I6b
z<GAzCob3a@T*JF(bWNo~Y|7^I<GG4G6rtY>`g?UCmRE^py;!-}t?^Xrbvf0#LQS=<
z(xzHhyHm|N->I%QsHtYPH`QEGQ_Z52yDVwB>s8&{T`vYe>cfSCU6Q9H8*|)ReRXvM
z3e!tCQXMy~ezO&(KMOkL<WQ_QXKHB)&eKgK=)Jfe_wqRm$E03*KYakYYaln#2T^bt
zmol!<@`=l_eBvrBpSbqQC$6{hc`7ZIPuxl66L(Mf#BEbPal@2PTp;BW7e+jnpakhd
zXzyA`ui}}&b1d^9iOh-x3TIX>P&~70fm$<WV1YU^W^jSJGiGRkdNXEtffi-V$O0|N
zn9&7FXUy0FEz6iK3zW&2#saO*nDGT#b1z~x(TDLngm)yo+eh&GGfrFdQTiBaXjQ&5
z+sF9B0X$gZ_imOFzj;7P{O)|f9OKJ9VzR{VAC?l2KtxJB22m;TD8!`1<Io}{9tj@f
zF}^%goIVcuoH&dr**rJQO>$%0%&91+qnv><fU*+hOq8=xqVx&+BwmdNak1<;QRGot
zyX!$Z_a5j(&C3hEBrEhFo&tzq<^c*bR3E2yIZlQHP~#-{=IY}duXpb8b;cdm$GNrM
zd6BO(?zleA9rezq`8wkU?Bm>B@4U>{8FynJ=iYkfmA=lnIQuv+s&`)F>x?V2kMojx
z=W~6XahdjUPS-mR`8wmm?c=<x-g$$sGd`mDIA`jexA;2an~IO~>U!sGzRvjS;^Vxg
z-g(T|`BU_1tN>m{7M{!iA<0Aa3}Q&{E(hT;NJudVujC+hajZ;1*MVq!LdF{n$y6jH
zIUuA{x!ylyYoj5VTD*`><p%$d9gT)$rt(5Ml^gv-b~hT5iO&n^R6gq;vbWKY%%fgN
zr*aeB>^D7&8V$+3?}cQJ7W6s)kV_g3$s33lk||%%=lw&b8x6@jkr$G85J9*2hg{ZZ
zNZ!)Ckh~!Yx|MG88_P_iA$f1~Lh}A5=yv~*s~Zi;o2(a-w@X1^@DF+1Dd9wGoOf$4
zB=5e0zal#?-uw!li-^Rr6`8v!7&x-xDT>@q!R8|?o}|d=%FIzZPgWreZC{CBR$$e$
z)M5snq1MA>tTF>f>1{4zqZI^XqZKlPj0rtMZHFmt2F;KL+G>RX+G<72FoPlr6gDFo
zXxNGZG;GDpD1%}O6g6WSXvAs(Xv8wi76us#1W5ypS#f~Itb`e7P(p#?W<mpvTS<V%
zt(2K$P)dQ4W=aE1Sgim}SZ!u2gW43R)ojy1yR3GAc3B-}JA*nDsNL+)K)bC@fOcD5
zW+#KX6sXhe(m;ExZh-b!J!Ut9dK9SJ?9o7zmI=_L)oYpz>Qx}q?A1W~tUiGDS^Z`o
zgZdSy&+K<Wfg{)fnzcih%q5X_Qp4RZ#4);q?nL@@ihs~uIE6M*TD(MGgszz~;syE=
zqySwg9-=Qp3eu>!kG=vagm2zA(N`gbsU)tWuR)5?jiNwbhZLn-#0=dHDMm-dFdc@}
zLXU|}^bJS`t`%weCZst1Rh&ZKf|L+M$LQOTk|IR^q9c$}Vkx~y-+|OBR?zeGT}W+W
z8!gcHAhnAzJnw<jA&PVZ-3zHx%;OMxAEYjEGrr5;52;(+jxYKTK<W_>(^h!jNv3#$
zHqcQ>z2aru03L+YC;mo#^bn+edKhDO8)d?gS1A#u$ZOOUrY8JE#B0>!h|&L@=<dXK
zVBrV&Pg9EV&c{6Rc_GLvo~K_wNb6J*bf+H^dKX^UqmsKMmEi9gP~ij;Jc1A@P|0L!
zXkB2vB#i#l&<yAzl3H<?!mEx_ZV&4>S^+kg0cD9Wi8!XMR#2M2AJQpe23^yz6_Tcq
zX9BA@UL#gmnm{PZE9{!atcWy4JQHZf@fx?H(gcQ4UQyRHVa22==9$1dj@K@$MVdf4
z%B#gS?Y0bQGCY&vn)X<6X#xi+uefWPv=Y*k@JwJPr>%WfQkp<Y$}1^N{l3c;OHB^H
zny+TDhaRCvF*!kT1w96-iDF_GeIIk!Os9(t^f;sd{`|O<o`4jjT_Q$LLJCoZ{z*?k
z3e)viN<V-U!NPl(eh4W_Pa_Y01Sv+ZVB(*K)I$Hp-@BfHWQZ;rrDq|<#Tq(`eheug
zMyQ*90x8LhrTJRwJqAS}Oc5clK=4P8W9U+~-o%Pd3c3In6R1@wSV)6ak@Z>y4%dRK
zcprmui5%xr_42nVNBl1V=LLb+f8_fH_&*W&o0WU)1omp{Cqt+pEhi3Ajq^Gn70Nhi
zsA{y=$Ekqv*9%yU*$`BPWfGQo1^1Kus99(ft%4^T3tsK{8*orfq#ACb+R7XAK|`R0
z=e%zOQ`lRvrIN*@jWU8VhBA&afwBu_H_9HANtAsk8&S5R3_n7%gq_uI1985@Sc;G$
z^ixoa^U-ICY>z0~7I}!Syr15~=VSe=PaMqjGa2;f^b0%#u&$+FLW)5870U1E52&?)
SKGs6_NAS{%^e1|m%>M$Wh+<Iy

literal 8603
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

diff --git a/target/classes/com/cdzy/activity/service/ActivityService.class b/target/classes/com/cdzy/activity/service/ActivityService.class
index 3f657fe2d62204570c1dc741a2bb8ed9e5e2ce86..9c858b2a548c8356a2650920269bc35f642a9217 100644
GIT binary patch
delta 73
zcmdnZe4Ux=)W2Q(7#J9A8H6Ts-4)_a&PYwp4lYS7DJ^DXVAjwKoA`7tBlF~DMl~rG
VMg|@RUZ7eg20k#!&maJ%1py&L55xcf

delta 46
ycmcc4yqlTp)W2Q(7#J9A83ZPB-JSS*HY3yI>5OVZ3``6>Kw%~ZUIsoe%?|)t=L&HE

diff --git a/target/classes/com/cdzy/activity/service/impl/ActivityServiceImpl.class b/target/classes/com/cdzy/activity/service/impl/ActivityServiceImpl.class
index 2a5c21cd9319491ca7a62ecd6bd6e1c1b843b223..472c2c83852e93098ee16705397de8471ef7f299 100644
GIT binary patch
delta 2090
zcma)7d2kbT6#ibC?WV~J6pL*f4^V`rP{L?IZMfRP48>Aq2xTlXvV?8Bm?kyZKs$^R
zXB_!U{HNm}j(<ACfFh@%MMS(1QB=GY6~$Zd!V3|p-)<5}M^GoTzvJyYzW2WOHhq^J
z33v~j*|i72R2i|=yTOz8Vj~_^@tB59s1cMe*H`F4%j`6QP4S2xovB+!m^VRDEWXl<
z&Df%1tA=gZE*Kk$cLqCqmg<(7Y>OJ*!ALw|1n*24iJss*dtI2&ySj{opg58+=t(fH
zGSF0LHU3}BLM3<t85KJ<^r2rcq4$2N7;WiGqeieUVwo#Ut0!#VW*Th*PhCT}v86G5
zt6*a98u6#kujn{^Qp0XMMOgF0b>Ri`1(kz9oext(Jeul^g}itgdsRH6;aNN<7*m+b
zV6$|#1X(+QE5_`nS2j8Ijq0)X;LS^y8xbosxE_Oj<Xyy;nU)#1qi@Cw8usBufwHp0
zNYH1?1+b?JcxZ^{J^XjH9A_aP;&@5J0lX|IO&U>RZ8DQqeUHPeAasGa`LOA8{4+-<
z?UZFkgSHboKZsXVyr$uG91;u}{92%z$yuFURu9{*GSF&kzp3FZyiJ--%Sh-}oK1BJ
zd+D5EV@^)r@8Ufb>Gw5!U^^fFPaOv6(38zZw`D7TsNo}gEO5st5R~QJ7P91p2cKy8
z6wQK?cEg%)=~gP~#clXZ!{_+I1{Skg^k|Bd5Obq9O^a*o>H1p3H~7}csjiJ61%X@}
zIAa#+NW^3DV1u&_nz>M*)ed`H!*_U?VUy>=dQfY>n&E|spER7n&jMenYZ+&(UbiA0
z0{@k{AWqTQg*Jh94+UCP{7MYHYm`fS72nY9M?H7RP+z3Oh}@CQipIT%UH-H{bI3e9
z#s9x~1YSKmp{9`(3@hNt;h*F=skZ0|)1KgPPnY40vY;lf>&Z3C6i)M~qR_O^_Ql>w
zvg8+Vm=HxL_uu#-E9U+?cQ<#%xt-)K$eVCis&+!Q^5DWBTy15*k5gQ=tOEYTY2E~X
z;S9A-_MY%{r)}MO4C6YIjz__Vt1ui_({eN=*I+EhU;@`ksKgWm(10q;!8pvrcq~LU
z7V&KxLD+FdqKIpIE{=T~APAw3CL%7l#D1>`2Dpj138Toyaa>zlfa5xpq6Q-v@p4Qi
zg6kRO2HtMORMcV?LYPY=3wT?MX)rLI1)70X%;H|mEWok)ERNMV9HmI*a3};&0@rD*
zQsF5ftaJgc;(Tpc&LW<H!+qG$)Q88nVaE>a^7LU*275Aies0wcbd2xEeixdn_aRf=
zk5>c_VG|E;2x{GacR$_{tiuEL>9AlgJhh5n$>2x^M>o<nf!ifwd^ZnQ@R`h~nNQm|
zTkp#ZzFLQ{Us0T>$JS%EBmdr!Pw^|odHF;~{(~bQ?N`*iyrMv^`IRjCW9tXntEw~j
zaiQHZZaDRyL*{|myf$J8S+2lM?1UyvWW}5Lvv3RUCiC~P`VXQ7kDwJ>$nI|3j{R7I
zLs-U7m%)!wyTd~b+q4<?u=*~ZSjHS9Zhne3iORGq_}AhQGSSUIec}}#ibSKT-LhH9
zMU>damGBI(4-^%qij68Zt2n6A5qmmB63ffWPoeA-TngMWg!(QSDt24Dq%=Q0!t~@~
N%DnVm29K1X<ZrW3E?@uv

delta 464
zcmYk2J1@gw6vlu5>Rpqn%b=9HtHia`B^ZcEBnE>R8i@r9qeRk(NjFmmpP?wKXx-{E
znoSm;z-SZk{Htj?yyrRRJ?G8yd(USm*XVxxy~_hryr$hrr`^G^K`3!(^C!N%-psdW
z&&bSs!^T<?0}EShOHcH`E<Kf2NNt5GrK(?*A+_~nG15vboGF^aP{X;R=YN0;%)Y@T
z8BL`UA62{i=Ijhrihis#P)Q@z1gNKpAkB0s_R+!!txVF!EbT1N!4jRUs2io54MGK<
zpwM8m=woJAT+1&if*Z2(%&BiPbZuhX3Zug0c=sKZarEMoW1T)0U_efT^fDy>ur@Z#
zoU%nCEHla~W2`f-1x*kW-2u~O9PtuIyvX5Wr^s<902h`YVh)@xVMR(@R_@ib@W5k1
T^QGNCseaaRi@g>nFSz~yq_Rh<

diff --git a/target/classes/com/cdzy/activity/uitls/ImageToBase64Converter.class b/target/classes/com/cdzy/activity/uitls/ImageToBase64Converter.class
index 22e5909983b1b9010d404d0061e40108e286a9ad..aac8a5a6b840256ddab2dea52be67d81aa5a6411 100644
GIT binary patch
delta 23
ecmdnUzL9-{6f+~oWNBtMRsjZf2EoZ`%-#S%?gX*`

delta 23
ecmdnUzL9-{6f-0DWNBtMR$&Hq29e2W%-#S&MFhJ5

diff --git a/target/classes/com/cdzy/activity/uitls/VerifyUtil.class b/target/classes/com/cdzy/activity/uitls/VerifyUtil.class
index be2b5c370fe1c20f3c4d8339fd831649d86e2fab..caaf60092260e0c536d7d9162fce7760ebb8966c 100644
GIT binary patch
delta 191
zcmWNKxoQGo7)8%77HZ54!37(UG%^ms!o9JK`xX+E;Aj~L*a)^JSSnbEy>-Awun^J-
zf`tP<i}(QgRp%~nuN}3co3Zw2;N%%MG5naznf4P%;vz+eGzJ+GWXY4;hV_g3edU1y
zaf;L_(V|R`3SU(Drp7?hAq^%pnM%9hjTIJu!Zq*g_~2jsL3pIinGRPzxzSY)EaesI
dG?Xd&g`O(XXAiRPk<SRH?fhw^RB-9=Rqmn%B|rcG

delta 191
zcmWNKyJ`Yq7(~x67Ty=pfQ@XoN{~RjbyiW=dsGY|tG0q*6R<U68NniKZ!M$|wh-(D
z!9u}j2|j@Ns&j^cnTv5TwzE*sz>SWV1W}UqGW7NEjE6KaG9<~0<tUJM;@Y2@zu>3H
z6D69IX=5^^!iXwkYD}o}NrQ#7-?aGQl{FR{;V&I_blFQj3QzR7^2UvK?tCa0mI??p
d8tPFzMPHc=IDqW?<WuMDtin^JqP8ni`v-!XB=7(L

diff --git a/target/generated-sources/annotations/com/cdzy/activity/model/table/ActivityTableDef.java b/target/generated-sources/annotations/com/cdzy/activity/model/table/ActivityTableDef.java
index 190116d..901b7df 100644
--- a/target/generated-sources/annotations/com/cdzy/activity/model/table/ActivityTableDef.java
+++ b/target/generated-sources/annotations/com/cdzy/activity/model/table/ActivityTableDef.java
@@ -9,17 +9,18 @@ public class ActivityTableDef extends TableDef{
 
         public final QueryColumn ACTIVITY_LOCATION =new QueryColumn(this,"activityLocation");
         public final QueryColumn ACTIVITY_NAME =new QueryColumn(this,"activityName");
-        public final QueryColumn STATUS =new QueryColumn(this,"status");
         public final QueryColumn START_TIME =new QueryColumn(this,"startTime");
+        public final QueryColumn MAX_NUM =new QueryColumn(this,"maxNum");
+        public final QueryColumn LIMIT_PEOPLE =new QueryColumn(this,"limitPeople");
+        public final QueryColumn ACTIVITY_ID =new QueryColumn(this,"activityId");
+        public final QueryColumn ACTIVITY_COVER =new QueryColumn(this,"activityCover");
+        public final QueryColumn STATUS =new QueryColumn(this,"status");
         public final QueryColumn REGISTRATION_START_TIME =new QueryColumn(this,"registrationStartTime");
         public final QueryColumn END_TIME =new QueryColumn(this,"endTime");
-        public final QueryColumn MAX_NUM =new QueryColumn(this,"maxNum");
         public final QueryColumn ACTIVITY_DESCRIPTION =new QueryColumn(this,"activityDescription");
-        public final QueryColumn LIMIT_PEOPLE =new QueryColumn(this,"limitPeople");
         public final QueryColumn REGISTRATION_END_TIME =new QueryColumn(this,"registrationEndTime");
-        public final QueryColumn ACTIVITY_ID =new QueryColumn(this,"activityId");
+        public final QueryColumn LIMIT_REGISTER =new QueryColumn(this,"limitRegister");
         public final QueryColumn ACTIVITY_SPONSOR =new QueryColumn(this,"activitySponsor");
-        public final QueryColumn ACTIVITY_COVER =new QueryColumn(this,"activityCover");
     /**
      * 所有字段。
      */
@@ -28,7 +29,7 @@ public class ActivityTableDef extends TableDef{
     /**
      * 默认字段，不包含逻辑删除或者 large 等字段。
      */
-    public final QueryColumn[]DEFAULT_COLUMNS=new QueryColumn[]{ ACTIVITY_LOCATION , ACTIVITY_NAME , STATUS , START_TIME , REGISTRATION_START_TIME , END_TIME , MAX_NUM , ACTIVITY_DESCRIPTION , LIMIT_PEOPLE , REGISTRATION_END_TIME , ACTIVITY_ID , ACTIVITY_SPONSOR , ACTIVITY_COVER };
+    public final QueryColumn[]DEFAULT_COLUMNS=new QueryColumn[]{ ACTIVITY_LOCATION , ACTIVITY_NAME , START_TIME , MAX_NUM , LIMIT_PEOPLE , ACTIVITY_ID , ACTIVITY_COVER , STATUS , REGISTRATION_START_TIME , END_TIME , ACTIVITY_DESCRIPTION , REGISTRATION_END_TIME , LIMIT_REGISTER , ACTIVITY_SPONSOR };
     public ActivityTableDef(){super("","activity");}
     private ActivityTableDef(String schema, String name, String alisa) {
         super(schema, name, alisa);