Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

.idea/encodings.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/business-service/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/business-service/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/vehicle-admin/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/vehicle-admin/src/main/resources" charset="UTF-8" />
   </component>

vehicle-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -155,7 +155,8 @@ public class SysUserController extends BaseController {
         ExcelUtil<SysUsers> util = new ExcelUtil<SysUsers>(SysUsers.class);
         List<SysUsers> userList = util.importExcel(file.getInputStream());
         String userId = getUserId();
-        String message = userService.importUser(userList, updateSupport, userId);
+        // todo 修改为 从字典中取默认密码
+        String message = userService.importUser(userList, updateSupport, userId, "123456");
         return success(message);
     }
 

vehicle-admin/src/main/resources/application.yml

@@ -19,7 +19,7 @@ base:
 
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 18810
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /