From e458ae3ec8c4ae734f6e5e32e3d970860a51ac82 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 09 九月 2024 18:35:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
index 0f13084..34fa3d2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
@@ -37,12 +37,11 @@
<select id="getRuleListByUnitId" resultType="com.ycl.platform.domain.vo.CalculateRuleCascaderVO">
<![CDATA[
- select id,
+ select id as value,
rule_name,
deduct_category,
calc_fraction,
calc_unit,
- id as value,
contract_id,
rule_condition as label
from t_calculate_rule
--
Gitblit v1.8.0