From 3b21b61d28097c72811ce5a0a6a72b7722c68b1d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 20 二月 2025 11:21:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java index 25b76a0..eb2678a 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java @@ -222,7 +222,7 @@ QueryWrapper<BaseParam> baseParamQuery = new QueryWrapper(); baseParamQuery.lambda() .eq(BaseParam::getIsdeleted,Constants.ZERO) - .eq(BaseParam::getType,Constants.THREE) + .in(BaseParam::getType,Constants.THREE,Constants.FOUR) .orderByAsc(BaseParam::getSortnum); List<BaseParam> list = baseParamMapper.selectList(baseParamQuery); if (CollectionUtils.isEmpty(list)){ -- Gitblit v1.9.3