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

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/ActivityServiceImpl.java

@@ -20,7 +20,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -113,7 +112,10 @@ public class ActivityServiceImpl implements ActivityService {
             changePoint.setChangeType(7);
             userPointsService.change(changePoint);
             // 记录领取信息（被邀请）
-            ActivityPartDO activityPartDO = new ActivityPartDO(null, activityDO.getId(), userAccountId, pUserAccountId, new Date());
+            ActivityPartDO activityPartDO = new ActivityPartDO();
+            activityPartDO.setActivityId(activityDO.getId());
+            activityPartDO.setUserAccountId(userAccountId);
+            activityPartDO.setPUserAccountId(pUserAccountId);
             activityDao.insertActivityPart(activityPartDO);
         }
         return ResultBody.success();

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: fb549fd6829d9f773b05cc3f37293e4bf1b4d3ea
+  newTag: 3d30e4206dee34e1b1fba6f78d400a80827e9203