Skip to content

Commit 1b3f704

Browse files
elunezelunez
committed
update elunez#273 
1 parent e294d30 commit 1b3f704

8 files changed

Lines changed: 14 additions & 221 deletions

File tree

‎eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class DictDetail implements Serializable {
3434

3535
/** 排序 */
3636
@Column(name = "sort")
37-
private String sort = "999";
37+
private Integer sort = 999;
3838

3939
@ManyToOne(fetch=FetchType.LAZY)
4040
@JoinColumn(name = "dict_id")

‎eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDto.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class DictDetailDto implements Serializable {
2020

2121
private String value;
2222

23-
private String sort;
23+
private Integer sort;
2424

2525
private DictSmallDto dict;
2626

‎sql/eladmin-gen.sql‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎sql/eladmin-mnt.sql‎

Lines changed: 0 additions & 162 deletions
This file was deleted.

‎sql/eladmin-user.sql‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎sql/eladmin.sql‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ CREATE TABLE `dict_detail` (
123123
`id` bigint(11) NOT NULL AUTO_INCREMENT,
124124
`label` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典标签',
125125
`value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典值',
126-
`sort` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '排序',
126+
`sort` smallint(6) NULL DEFAULT NULL COMMENT '排序',
127127
`dict_id` bigint(11) NULL DEFAULT NULL COMMENT '字典id',
128128
`create_time` datetime NULL DEFAULT NULL COMMENT '创建日期',
129129
PRIMARY KEY (`id`) USING BTREE,
@@ -134,12 +134,12 @@ CREATE TABLE `dict_detail` (
134134
-- ----------------------------
135135
-- Records of dict_detail
136136
-- ----------------------------
137-
INSERT INTO `dict_detail` VALUES (1, '激活', 'true', '1', 1, '2019-10-27 20:31:36');
138-
INSERT INTO `dict_detail` VALUES (2, '禁用', 'false', '2', 1, NULL);
139-
INSERT INTO `dict_detail` VALUES (3, '启用', 'true', '1', 4, NULL);
140-
INSERT INTO `dict_detail` VALUES (4, '停用', 'false', '2', 4, '2019-10-27 20:31:36');
141-
INSERT INTO `dict_detail` VALUES (5, '启用', 'true', '1', 5, NULL);
142-
INSERT INTO `dict_detail` VALUES (6, '停用', 'false', '2', 5, '2019-10-27 20:31:36');
137+
INSERT INTO `dict_detail` VALUES (1, '激活', 'true', 1, 1, '2019-10-27 20:31:36');
138+
INSERT INTO `dict_detail` VALUES (2, '禁用', 'false', 2, 1, NULL);
139+
INSERT INTO `dict_detail` VALUES (3, '启用', 'true', 1, 4, NULL);
140+
INSERT INTO `dict_detail` VALUES (4, '停用', 'false', 2, 4, '2019-10-27 20:31:36');
141+
INSERT INTO `dict_detail` VALUES (5, '启用', 'true', 1, 5, NULL);
142+
INSERT INTO `dict_detail` VALUES (6, '停用', 'false', 2, 5, '2019-10-27 20:31:36');
143143

144144
-- ----------------------------
145145
-- Table structure for email_config

‎sql/update.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/**
2+
将字典详情的 sort 字段改为数值型
3+
*/
4+
alter table dict_detail modify column sort smallint(6);

‎sql/脚本如何选择.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
1、eladmin.sql 为 eladmin 完整的sql脚本，适合于第一次导入脚本的用户
2-
2、eladmin-gen.sql 为 eladmin 代码生成模块更新的sql脚本
3-
3、eladmin-mnt.sql 为 eladmin 运维管理模块更新的sql脚本
2+
2、update.sql 为版本更新中数据库结构变动的脚步内容

0 commit comments

Comments
 (0)