From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码,解决冲突

---
 src/main/java/com/zy/common/CodeBuilder.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index cde6922..5aed57d 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,11 +17,12 @@
 //        generator.table="sys_host";
         // sqlserver
         generator.sqlOsType = SqlOsType.SQL_SERVER;
-        generator.url="10.10.10.100:1433;databasename=bfasrs";
+        generator.url="127.0.0.1:1433;databasename=phyzasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="asr_bas_ste_err_log";
+        generator.table="man_flow_log";
         generator.packagePath="com.zy.asrs";
+        generator.sql = false;
         generator.build();
     }
 

--
Gitblit v1.9.1