From 8a141fa444e3d605f05763c6003085c24880e5c6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 08:25:06 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index b0983bb..ee4f1a5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_matnr";
- generator.tableDesc="鐗╂枡淇℃伅琛�";
+ generator.table="man_loc_area_rela";
+ generator.tableDesc="loc areas rela";
generator.packagePath="com.vincent.rsf.server.manager";
generator.build();
@@ -31,15 +31,15 @@
/*
CREATE TABLE `man_tablename` (
`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'ID',
- `uuid` VARCHAR(255) DEFAULT NULL COMMENT '缂栧彿',
+ `code` VARCHAR(255) DEFAULT NULL COMMENT '缂栧彿',
`name` VARCHAR(255) DEFAULT NULL COMMENT '鍚嶇О(*)',
`status` INT(1) NOT NULL DEFAULT '1' COMMENT '鐘舵�亄1:姝ｅ父,0:鍐荤粨}',
`deleted` INT(1) NOT NULL DEFAULT '0' COMMENT '鏄惁鍒犻櫎{1:鏄�,0:鍚',
`tenant_id` INT(11) DEFAULT NULL COMMENT '绉熸埛[sys_tenant]',
`create_by` BIGINT(20) DEFAULT NULL COMMENT '娣诲姞浜哄憳[sys_user]',
- `create_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '娣诲姞鏃堕棿',
+ `create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '娣诲姞鏃堕棿',
`update_by` BIGINT(20) DEFAULT NULL COMMENT '淇敼浜哄憳[sys_user]',
- `update_time` TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿',
+ `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '淇敼鏃堕棿',
`memo` VARCHAR(255) DEFAULT NULL COMMENT '澶囨敞',
PRIMARY KEY (`id`)
) ENGINE=INNODB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
--
Gitblit v1.9.1