Merge remote-tracking branch 'origin/develop' into test

service-manage/src/main/java/com/simuwang/manage/api/LoginController.java

@@ -53,7 +53,7 @@ public class LoginController {
      *                  //     * @param response  响应体对象
      * @return /
      */
-//    @SystemLog(value = "登录", type = SystemLog.Type.LOGIN)
+    @SystemLog(value = "登录", type = SystemLog.Type.LOGIN)
     @PostMapping("login")
     public ResultVo<String> login(@RequestBody LoginUser loginUser) {
         ShiroToken shiroToken = new ShiroToken(loginUser.getUsername(), loginUser.getPassword());

service-manage/src/main/java/com/simuwang/manage/dto/LoginUser.java

@@ -34,6 +34,6 @@ public class LoginUser {
     @Override
     public String toString() {
         return "{username='" + username + '\'' +
-                ", password='***'";
+                ", password='***'}";
     }
 }