Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -3333,7 +3333,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 List<User> users = userList.stream().filter(ul -> ul.getPhone() != null).collect(Collectors.toList());
                 Optional<User> optional = users.stream().filter(ul -> ul.getPhone() != null && ul.getPhone().equals(user.getString("userPrincipalName"))).findFirst();
                 if(optional.isPresent()){
-                    userMapper.deleteById(optional.get().getId());
+                    optional.get().setIsActive(0);
+                    userMapper.updateById(optional.get());
                 }
                 continue;
             }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -18,6 +18,7 @@ spring:
     url: jdbc:mysql://47.101.180.183:17089/man_mingyi?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
     username: root
     password: P011430@Huoshi*
+    
     hikari:
       maximum-pool-size: 60
       minimum-idle: 10