Merge branch 'master' into cc_20250327_tallyBook

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java

coolstore-partner-model/src/main/java/com/cool/store/request/DeleteShopRequest.java

@@ -3,6 +3,8 @@ package com.cool.store.request;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author zhangchenbiao
  * @FileName: DeleteShopRequest
@@ -13,6 +15,8 @@ import lombok.Data;
 public class DeleteShopRequest {
 
     @ApiModelProperty("店铺id")
+    @NotNull
     private Long shopId;
 
+    private String userId;
 }