支付参数

cash-api/order-server/src/main/java/com/czg/controller/DistributionPayController.java

@@ -46,8 +46,8 @@ public class DistributionPayController {
      */
     @PostMapping("/mchRecharge")
     @Debounce(value = "#payParam.userId")
-    public CzgResult<Map<String, String>> mchRecharge(HttpServletRequest request, @Validated @RequestBody MkDistributionPayDTO payParam) {
+    public CzgResult<Map<String, String>> mchRecharge(@Validated @RequestBody MkDistributionPayDTO payParam) {
         AssertUtil.isBlank(payParam.getCode(), "微信code不为空");
-        return CzgResult.success(payService.mchRecharge(ServletUtil.getClientIP(request), payParam));
+        return CzgResult.success(payService.mchRecharge(payParam));
     }
 }

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopMerchant.java

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Table("tb_shop_merchant2")
+@Table("tb_shop_merchant")
 public class ShopMerchant implements Serializable {
 
     @Serial