From 18cbfecbf98cb3c45becf108042d21e0508576e4 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 27 九月 2024 10:28:24 +0800
Subject: [PATCH] 2024-09-27 朱宝民 生成总账时，取消当天的限制

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml   |    4 +++-
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
index c5c9dd8..aac929f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -140,7 +140,9 @@
     SELECT
       DISTINCT Date(ope.operate_dt) AS operateDate
     FROM se_card_operate ope
-    WHERE Date(ope.operate_dt) NOT IN(SELECT operate_date FROM se_general) AND Date(ope.operate_dt) != CURDATE()
+    WHERE Date(ope.operate_dt) NOT IN(SELECT operate_date FROM se_general)
+<!--      鍙栨秷褰撳ぉ闄愬埗-->
+<!--      AND Date(ope.operate_dt) != CURDATE()-->
   </select>
 
   <!--鏍规嵁浜ゆ槗鏃ユ湡鑾峰彇鎬昏处璁板綍鍒楄〃锛堝緟鐢熸垚鐨勶級  -->
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
index 6785052..addc58c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
@@ -3,8 +3,8 @@
         include: global, database, database-ym, database-pj, database-test
 user:
     defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
-#    defaultPassword: "abc_123"
-    defaultPassword: "admin"
+    defaultPassword: "abc_123"
+#    defaultPassword: "admin"
 
 #actutor鐨剋eb绔彛
 management:

--
Gitblit v1.8.0