Merge branch 'master' of https://gitee.com/tearn/JSH_ERP

# Conflicts:
#	src/main/java/com/jsh/erp/service/app/AppService.java
#	src/main/java/com/jsh/erp/service/userBusiness/UserBusinessService.java

erp_web/pages/manage/role.html

@@ -203,8 +203,11 @@
             if (r) {
                 $.ajax({
                     type: "post",
-                    url: "/role/" + roleID + "/delete",
+                    url: "/role/batchDeleteRoleByIds",
                     dataType: "json",
+                    data: ({
+                        ids: roleID,
+                    }),
                     success: function (res) {
                         if(res && res.code == 200) {
                             $("#searchBtn").click();
@@ -242,7 +245,7 @@
                     }
                     $.ajax({
                         type: "post",
-                        url: "/role/batchDelete",
+                        url: "/role/batchDeleteRoleByIds",
                         dataType: "json",
                         async: false,
                         data: ({