Merge remote-tracking branch 'origin/master'

lin

2024-04-10 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af

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

@@ -280,8 +280,7 @@
      // 查询物业公司是否存在
      QueryWrapper<PropertyCompanyEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("is_deleted", 0)
         .eq("dept_id", dept.getId())
         .eq("name", dept.getDeptName());
         .eq("dept_id", dept.getId());
      PropertyCompanyEntity propertyCompanyEntity = propertyCompanyService.getOne(wrapper);
      if (null != propertyCompanyEntity) {
         // 修改