Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/merchant/ShopMerchantEditDTO.java

@@ -1,6 +1,7 @@
 package com.czg.account.dto.merchant;
 
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
@@ -8,6 +9,7 @@ import lombok.Data;
  */
 @Data
 public class ShopMerchantEditDTO {
+    @NotNull(message = "店铺id不为空")
     private Long shopId;
     @NotEmpty(message = "支付系统商户id不为空")
     private String storeId;

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopMerchantService.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  */
 public interface ShopMerchantService extends IService<ShopMerchant> {
 
-    ShopMerchant detail();
+    ShopMerchant detail(Integer shopId);
 
     Boolean edit(ShopMerchantEditDTO shopMerchantEditDTO);
     @Override