Browse Source

Merge branch 'V0.1.1_test' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.1.1_test

# Conflicts:
#	project_data/sql/0.1.1/soc/soc.sql
jiawuxian 1 year ago
parent
commit
f369e96eb9
1 changed files with 8 additions and 1 deletions
  1. 8 1
      project_data/sql/0.1.1/soc/soc.sql

+ 8 - 1
project_data/sql/0.1.1/soc/soc.sql

@@ -1028,7 +1028,7 @@ BEGIN
             ADD COLUMN `address` varchar(255) NULL COMMENT '安装位置' AFTER `device_model`,
             ADD COLUMN `purchasing_time` date NULL COMMENT '采购时间' AFTER `address`,
             ADD COLUMN `use_time` datetime NULL COMMENT '开始使用时间' AFTER `maintenance_term`,
-            ADD COLUMN `remove _time` datetime NULL COMMENT '移除时间' AFTER `use_time`,
+            ADD COLUMN `remove_time` datetime NULL COMMENT '移除时间' AFTER `use_time`,
             ADD COLUMN `scrap_time` datetime NULL COMMENT '报废时间' AFTER `remove _time`,
             ADD COLUMN `business_device_id` bigint NULL COMMENT '业务设备id' AFTER `definition`;
     END IF;
@@ -1158,6 +1158,13 @@ INSERT INTO sys_multi_layer_dictionary (id, code, name, parent_id, type, type_na
 INSERT INTO sys_multi_layer_dictionary (id, code, name, parent_id, type, type_name, level, sort, create_time, modified_name, update_time, modified_id, deleted) VALUES (3713672266842157, '316', '防火门', 3713672266842141, 'AssetDeviceType', '资产设备类', 2, 0, null, null, null, null, 0);
 INSERT INTO sys_multi_layer_dictionary (`id`, `code`, `name`, `parent_id`, `type`, `type_name`, `level`, `sort`, `create_time`, `modified_name`, `update_time`, `modified_id`, `deleted`) VALUES (6, '226', '报警控制器', 3713670431768576, 'AssetDeviceType', '资产设备类', 2, 0, NULL, NULL, NULL, NULL, 0);
 
+
+delete from sys_dict_type where dict_type='sys_yes_no_num';
+delete from sys_dict_data where dict_type='sys_yes_no_num';
+INSERT INTO `sys_dict_type` ( `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('系统是否(数字)', 'sys_yes_no_num', '0', '超级管理员', '2024-09-26 16:55:47', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (0, '是', '1', 'sys_yes_no_num', NULL, 'default', 'N', '0', '超级管理员', '2024-09-26 16:56:06', '', NULL, NULL);
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (0, '否', '0', 'sys_yes_no_num', NULL, 'default', 'N', '0', '超级管理员', '2024-09-26 16:56:13', '', NULL, NULL);
+
 DELETE from `sys_role_menu` where menu_id=1839945558511747073;
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 1839945558511747073);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 1839945558511747073);