Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/BuildSignInCodeFormDTO.java

@@ -27,5 +27,6 @@ public class BuildSignInCodeFormDTO implements Serializable {
     @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
     private String userId;
 
+    @NotBlank(message = "tokenDto获取customerId为空", groups = AddUserInternalGroup.class)
     private String customerId;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSignInRecordController.java

@@ -102,6 +102,7 @@ public class ActSignInRecordController {
     @PostMapping("geturl")
     public Result<BuildSignInCodeResultDTO> getSignInUrl(@LoginUser TokenDto tokenDto, @RequestBody BuildSignInCodeFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO, BuildSignInCodeFormDTO.AddUserInternalGroup.class);
         return new Result<BuildSignInCodeResultDTO>().ok(actSignInRecordService.getSignInUrl(formDTO));
     }