Merge remote-tracking branch 'origin/master'

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

@@ -8,6 +8,7 @@ import lombok.Data;
  */
 @Data
 public class ShopMerchantEditDTO {
+    private Long shopId;
     @NotEmpty(message = "支付系统商户id不为空")
     private String storeId;
     @NotEmpty(message = "支付系统商户名称不为空")