From 06ba5eb015fc27866858c70460fc0ee1e9aaeede Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 28 四月 2024 17:06:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
index f22190c..d04f8d5 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml
@@ -41,6 +41,7 @@
calc_fraction,
calc_unit,
id as value,
+ contract_id,
if(rule_condition is not null, rule_condition, if(rule_desc is not null, rule_desc, rule_name)) as label,
parent_id
from t_calculate_rule
--
Gitblit v1.8.0