Merge branch 'dev/2024/0407/update-business' of Harper/feifan-backend-zx-business into master

更新字段

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/aftersale/AfterSaleDO.java

@@ -206,6 +206,6 @@ public class AfterSaleDO extends BaseDO {
     /**
      * 商户id
      */
-    private Long merchant_id;
+    private Long merchantId;
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/aftersale/AfterSaleMapper.java

@@ -52,7 +52,7 @@ public interface AfterSaleMapper extends BaseMapperX<AfterSaleDO> {
         return selectCount(new LambdaQueryWrapperX<AfterSaleDO>()
                 .eqIfPresent(AfterSaleDO::getUserId, userId)
                 .eqIfPresent(AfterSaleDO::getShopId, shopId)
-                .eqIfPresent(AfterSaleDO::getMerchant_id, merId)
+                .eqIfPresent(AfterSaleDO::getMerchantId, merId)
                 .in(AfterSaleDO::getStatus, statuses));
     }