From a1278f8b1edebde8114ca4add0f32d74495a835b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 20 二月 2025 14:21:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
index 4b3fa26..e882f25 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
@@ -67,5 +67,5 @@
      * @param unitId 杩愮淮鍗曚綅
      * @return 鏁版嵁
      */
-    List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId);
+    List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId, String now);
 }

--
Gitblit v1.8.0