Merge branch 'dev_oper_role' into develop

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml

@@ -48,6 +48,6 @@
                  LEFT JOIN role_operation_default d ON (o.OPERATION_KEY = d.OPERATION_KEY AND d.DEL_FLAG = '0'
             AND d.ROLE_KEY = #{roleKey})
         WHERE o.DEL_FLAG = '0'
-        ORDER BY o.OPERATION_KEY ASC
+        ORDER BY o.OPERATION_NAME ASC
     </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.13__alter_gov_staff_role.sql

@@ -1,9 +0,0 @@
-ALTER TABLE `gov_staff_role_template`
-ADD COLUMN `DESCRIPTION`  varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色对应的职责说明' AFTER `FULL_TIME_ONLY`,
-ADD COLUMN `SORT`  int(11) NULL DEFAULT NULL COMMENT '排序' AFTER `DESCRIPTION`;
-
-
-ALTER TABLE `gov_staff_role`
-MODIFY COLUMN `FULL_TIME_ONLY`  tinyint(1) NULL DEFAULT 1 COMMENT '是否只有全职 1对应true 0对应false' AFTER `ORG_TYPE`,
-MODIFY COLUMN `SORT`  int(11) NULL DEFAULT NULL COMMENT '排序' AFTER `FULL_TIME_ONLY`,
-ADD COLUMN `DESCRIPTION`  varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色对应的职责说明' AFTER `FULL_TIME_ONLY`;