Merge remote-tracking branch 'origin/dev/20200616_1.3.5' into debug

# Conflicts:
#	src/main/java/com/diagbot/config/ResourceServerConfigurer.java

doc/010.20200617v1.3.5/qc_initv1.3.5.sql

@@ -1,11 +1,7 @@
 use `qc`;
 
-UPDATE `sys_permission` SET is_deleted = 'Y' WHERE permissionUrl LIKE '/console%' AND is_deleted='N';
+-- UPDATE `sys_permission` SET is_deleted = 'Y' WHERE permissionUrl LIKE '/console%' AND is_deleted='N';
 
-UPDATE sys_menu_permission SET is_deleted='Y'
-where permission_id in(
-select id from  `sys_permission`  WHERE permissionUrl LIKE '/console%') AND is_deleted='N';
+-- UPDATE sys_menu_permission SET is_deleted='Y' where permission_id in(select id from  `sys_permission`  WHERE permissionUrl LIKE '/console%') AND is_deleted='N';
 
-UPDATE sys_role_permission SET is_deleted='Y'
-where permission_id in(
-select id from  `sys_permission`  WHERE permissionUrl LIKE '/console%') AND is_deleted='N';
+-- UPDATE sys_role_permission SET is_deleted='Y'where permission_id in(select id from  `sys_permission`  WHERE permissionUrl LIKE '/console%') AND is_deleted='N';