Merge remote-tracking branch 'origin/master' into oracle_T001_202411121430

# Conflicts:
#	C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyCloudServiceImpl.java

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyCloudServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import pps.cloud.base.service.IBasePriceStrategyCloudService;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
 import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
@@ -43,12 +43,7 @@ public class BasePriceStrategyCloudServiceImpl implements IBasePriceStrategyClou
         //查明细
         BasePriceStrategyDetailMapper detailMapper = context.getBean(BasePriceStrategyDetailMapper.class);
         List<BasePriceStrategyDetailEnt> detailList = detailMapper.selectList(
-                new QueryWrapper<BasePriceStrategyDetailEnt>()
-                        .select("*",
-                                "STR_TO_DATE( CONCAT( START_TIME, ':00' ), '%H:%i:%s' ) AS openTime",
-                                "STR_TO_DATE( CONCAT( END_TIME, ':00' ), '%H:%i:%s' ) AS closeTime"
-                        )
-                        .lambda()
+                new LambdaQueryWrapper<BasePriceStrategyDetailEnt>()
                         .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
                         .eq(CharSequenceUtil.isNotBlank(input.getStrategyMonth()), BasePriceStrategyDetailEnt::getStrategyMonth, input.getStrategyMonth())
                         .in(CollUtil.isNotEmpty(input.getMonthList()), BasePriceStrategyDetailEnt::getStrategyMonth, input.getMonthList())