From 04352f6ff14e00bcec502f1d0088274353ca7bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 25 Mar 2025 14:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/czg/mergedata/common/utils/CodeGen.java   | 6 +++---
 .../mergedata/cur/service/impl/CurConsInfoServiceImpl.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/czg/mergedata/common/utils/CodeGen.java b/src/main/java/com/czg/mergedata/common/utils/CodeGen.java
index 60c8bda..abb6d07 100644
--- a/src/main/java/com/czg/mergedata/common/utils/CodeGen.java
+++ b/src/main/java/com/czg/mergedata/common/utils/CodeGen.java
@@ -18,8 +18,8 @@ public class CodeGen {
     private final static String DATABASE = "czg_cashier_test";
     private final static String OLD_DATABASE = "fycashier";
 
-    private final static boolean IS_OLD_VERSION = false;
-//    private final static boolean IS_OLD_VERSION = true;
+//    private final static boolean IS_OLD_VERSION = false;
+    private final static boolean IS_OLD_VERSION = true;
 
     public static void main(String[] args) {
         //配置数据源
@@ -81,7 +81,7 @@ public class CodeGen {
         //设置表前缀和只生成哪些表，setGenerateTable 未配置时，生成所有表
         globalConfig.getStrategyConfig()
                 .setTablePrefix("tb_")
-                .setGenerateTable("tb_shop_order_statistic", "tb_shop_prod_statistic", "tb_shop_table_order_statistic");
+                .setGenerateTable("tb_shop_pay_type");
 
         EntityConfig entityConfig = globalConfig.getEntityConfig();
         if (IS_OLD_VERSION) {
diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurConsInfoServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurConsInfoServiceImpl.java
index bd0c897..d422f8a 100644
--- a/src/main/java/com/czg/mergedata/cur/service/impl/CurConsInfoServiceImpl.java
+++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurConsInfoServiceImpl.java
@@ -63,7 +63,6 @@ public class CurConsInfoServiceImpl extends ServiceImpl<CurConsInfoMapper, CurCo
         mergeConsGroup();
         mergeConsInfo();
         mergeProdConsRelation();
-
         return CzgResult.success("合并耗材数据成功");
     }
 
@@ -106,6 +105,7 @@ public class CurConsInfoServiceImpl extends ServiceImpl<CurConsInfoMapper, CurCo
             curConsInfo.setDefaultUnit(oldConsInfo.getDefaultUnit());
             curConsInfo.setCreateTime(oldConsInfo.getCreateTime());
             curConsInfo.setUpdateTime(oldConsInfo.getUpdateTime());
+            curConsInfos.add(curConsInfo);
         });
 
         saveBatch(curConsInfos);