Merge remote-tracking branch 'origin/test' into test

cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkShopRechargeDTO.java

@@ -75,6 +75,6 @@ public class MkShopRechargeDTO implements Serializable {
     /**
      * 充值面额
      */
-    private List<MkShopRechargeDetailDTO> shopRechargeDetailList;
+    private List<MkShopRechargeDetailDTO> rechargeDetailList;
 
 }

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java

@@ -84,9 +84,9 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
             shopRecharge.setShopIdList(JSONArray.toJSONString(shopRechargeDTO.getShopIdList()));
         }
 
-        if (shopRechargeDTO.getShopRechargeDetailList() != null && !shopRechargeDTO.getShopRechargeDetailList().isEmpty()) {
+        if (shopRechargeDTO.getRechargeDetailList() != null && !shopRechargeDTO.getRechargeDetailList().isEmpty()) {
             shopRechargeDetailService.remove(new QueryWrapper().eq(MkShopRechargeDetail::getShopRechargeId, shopRecharge.getId()));
-            shopRechargeDTO.getShopRechargeDetailList().forEach(item -> {
+            shopRechargeDTO.getRechargeDetailList().forEach(item -> {
                 MkShopRechargeDetail mkShopRechargeDetail = BeanUtil.copyProperties(item, MkShopRechargeDetail.class,"couponInfoList");
                 mkShopRechargeDetail.setCouponInfoList(JSONArray.toJSONString(item.getCouponInfoList()));
                 mkShopRechargeDetail.setShopRechargeId(shopRecharge.getId());