Merge branch 'Release-1.3' into develop

# Conflicts:
#	src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml
#	src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml

1 files changed, 13 insertions, 10 deletions

diff --git a/db/init/galaxy_stru_ui_mysql.sql b/db/init/galaxy_stru_ui_mysql.sql
index dfa681e..1d601e5 100644
--- a/db/init/galaxy_stru_ui_mysql.sql
+++ b/db/init/galaxy_stru_ui_mysql.sql
@@ -80,16 +80,19 @@ CREATE TABLE `ui_sys_dict_info` (
 ) ENGINE=FEDERATED AUTO_INCREMENT=448 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:[email protected]:3306/gwall/sys_dict_info';
 
 
-CREATE TABLE `ui_code_app_dic` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `app_name` varchar(255) DEFAULT '',
-  `app_name_zh` varchar(255) DEFAULT NULL,
-  `view_code` varchar(255) DEFAULT '' COMMENT '应用编码',
-  `icon` varchar(255) DEFAULT '',
-  `behavior` varchar(255) DEFAULT '' COMMENT '行为细分',
-  `core_app` int(11) DEFAULT NULL COMMENT '是否是核心应用（1：是，0：否）',
-  PRIMARY KEY (`id`)
-  ) ENGINE=FEDERATED AUTO_INCREMENT=399 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:[email protected]:3306/gwall/code_app_dic';
+  CREATE TABLE `ui_code_app_dic` (
+   `id` int(11) NOT NULL AUTO_INCREMENT,
+   `app_name` varchar(255) CHARACTER SET utf8mb4 DEFAULT '',
+   `app_name_zh` varchar(255) CHARACTER SET utf8mb4 DEFAULT '',
+   `view_code` varchar(255) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '应用编码',
+   `icon` varchar(255) DEFAULT '',
+   `behavior` varchar(255) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '行为细分',
+   `core_app` int(11) DEFAULT NULL COMMENT '是否是核心应用（1：是，0：否）',
+   `app_service_id` int(10) unsigned zerofill DEFAULT NULL COMMENT '业务类型编号',
+   `app_service` varchar(255) CHARACTER SET utf8mb4 DEFAULT '',
+   `lib` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT 'lib类别',
+   PRIMARY KEY (`id`)
+  ) ENGINE=FEDERATED AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:[email protected]:3306/gwall/code_app_dic';