Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
zhangwq
2018-12-04 16:43:21 +08:00
8 changed files with 10 additions and 11 deletions

View File

@@ -3,6 +3,5 @@ INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `
#日志查询-出入口字典添加
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('81', '出入口', 'ENTRANCE', '出入口id和对应的名称', 'user:管理员,2018-12-03 18:45:59edit|用户管理员,在2018-08-07 09:53:56修改|用户管理员,在2018-06-15 11:53:01修改|用户管理员,在2018-06-15 11:52:16修改|用户管理员,在2018-06-15 11:35:15修改', '2018-06-15 11:34:02', '2018-12-03 18:45:59', '1');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3168', '1', 'astana', 'astana', '0', '1', '1', '81');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3169', '2', 'almaty', 'almaty', '0', '1', '1', '81');