Merge remote-tracking branch 'origin/master'

linwei

2023-12-29 f6332b2e13e9cee67ee30646063e38c403554f89

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -495,7 +495,7 @@

   @Override
   public List<UserEntity> getUserInfoByCode(String houseCode, String type) {
      if (type.equals("1")) {
      if (type.equals("0")) {
         IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
         return bean.getGridManByCode(houseCode);
      } else {