Merge remote-tracking branch 'origin/dev' into dev

db/food.sql

--- ----------------------------
---  Table structure for `美食表`
--- ----------------------------
-DROP TABLE IF EXISTS `t_food`;
-CREATE TABLE `t_food`
-(
-  `food_id`     int(11)     NOT NULL AUTO_INCREMENT COMMENT '食品ID',
-  `food_name`   varchar(32) NOT NULL COMMENT '食品名称',
-  `favorite`    int(11)          DEFAULT NULL COMMENT '喜欢',
-  `sort`        int(11)          DEFAULT '1' COMMENT '排序值',
-  `create_time` timestamp   NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `update_time` timestamp   NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-  `del_flag`    char(1)          DEFAULT '0' COMMENT '逻辑删除标记(0--正常 1--删除)',
-  PRIMARY KEY (`food_id`) USING BTREE
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8
-  ROW_FORMAT = DYNAMIC COMMENT ='美食表';

db/zhjg.sql

-/*
- Navicat Premium Data Transfer
-
- Source Server         : 智慧公路
- Source Server Type    : MySQL
- Source Server Version : 50725
- Source Host           : localhost:3306
- Source Schema         : aroad
-
- Target Server Type    : MySQL
- Target Server Version : 50725
- File Encoding         : 65001
-
- Date: 15/03/2019 16:22:05
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for T_ZHJG_DCKH_RW
--- ----------------------------
-DROP TABLE IF EXISTS `T_ZHJG_DCKH_RW`;
-CREATE TABLE `T_ZHJG_DCKH_RW`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `rwmc` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务名称',
-  `rwzt` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务状态',
-  `dblx` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '督办类型',
-  `qtdw` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '牵头单位',
-  `cydw` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参与单位',
-  `bjsx` date NULL DEFAULT NULL COMMENT '办结时限',
-  `xfsj` datetime(6) NULL DEFAULT NULL COMMENT '任务下发时间',
-  `dbnr` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '督办内容',
-  `dbfj` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '督办附件',
-  `dbr` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '督办人',
-  `creator` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
-  `update_person` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` timestamp(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
-  `status` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '状态：根据具体需求定义',
-  `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否删除  -1：已删除  0：正常',
-  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '督查督办任务表' ROW_FORMAT = Dynamic;
-
-
-
--- ----------------------------
--- Table structure for T_ZHJG_DCKH_RW_FF
--- ----------------------------
-DROP TABLE IF EXISTS `T_ZHJG_DCKH_RW_FF`;
-CREATE TABLE `T_ZHJG_DCKH_RW_FF`  (
-  `id` int(9) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `rwid` int(11) NULL DEFAULT NULL COMMENT '督办任务id',
-  `rwmc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '督办任务名称',
-  `dwmc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '承办单位名称',
-  `dwdm` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '承办单位代码',
-  `zt` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '状态',
-  `creator` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
-  `create_time` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
-  `update_person` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
-  `update_time` timestamp(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
-  `status` varchar(4) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '状态：根据具体需求定义',
-  `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否删除  -1：已删除  0：正常',
-  `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '督查督办任务分发表' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- sys_menu 新增
--- ----------------------------
-insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
-    values ( '61100', null, 'zhjg_zhjgdckhrwff', '1', null, '1', '61110', '0', '2018-05-15 21:35:18', '0', '2018-07-29 13:38:59', '待办任务');
-insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
-    values ( '61100', null, 'zhjg_zhjgdckhrwff_edit', '1', null, '1', '61111', '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '待办任务接收');
-insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
-    values ( '61100', null, 'zhjg_zhjgdckhrwff_del', '1', null, '1', '61112', '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '待办任务反馈');
-
-
-SET FOREIGN_KEY_CHECKS = 1;

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false
     username: root
-    password: root
+    password: 123456
   cache:
     type: redis
   redis: