From 777b31903904801e81bbf89b6eddb3d2f0feed87 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 三月 2025 09:17:44 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 78fd8e2..286a6b3 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,24 +22,24 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_matnr_group";
- generator.tableDesc="鐗╂枡鍒嗙被琛�";
- generator.packagePath="com.vincent.rsf.server.manager";
+ generator.table="man_loc_area_mat";
+ generator.tableDesc="loc areas mats";
+ generator.packagePath="com.vincent.rsf.server.test";
generator.build();
}
/*
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