Merge remote-tracking branch 'origin/develop' into develop

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 067c56565a3faaf039b2f06a9b18a78aebb86d7b
+  newTag: 1a1cff00ad9cbf6676879d58e4d8b15163be1114

src/pages/activityManage/rewardsManage/index.tsx

@@ -191,6 +191,11 @@ const RewardsManageView = () => {
               message.warning('连续签到天数不能重复').then();
               return;
             }
+            // 判断连续签到天数不能大于签到周期
+            if (signData?.period && e.numberOfDays > signData?.period) {
+              message.warning('连续签到天数不能大于签到周期').then();
+              return;
+            }
             setSignInfoList([...(signInfoList || []), { ...e, id: new Date().getTime() }]);
           }
           setAddEditShow(false);