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

jiaosong

2023-11-09 9b5ae024969593452610b554780ec2b3547eef96

 server/services/src/main/java/com/doumee/service/business/impl/PricingParamServiceImpl.java

@@ -95,7 +95,7 @@
                .set(PricingParam::getName,pricingParam.getName())
//                .set(PricingParam::getStatus,pricingParam.getStatus())
                .set(PricingParam::getStartDate,pricingParam.getStartDate())
                .set(PricingParam::getEndDate,pricingParam.getEndDate())
                .set(PricingParam::getEndDate,Utils.Date.getDayOfEnd(pricingParam.getEndDate()))
                .set(PricingParam::getSortnum,pricingParam.getSortnum());
        pricingParamMapper.update(null,wrapper);
    }