Merge remote-tracking branch 'origin/master'

linwe

2023-11-28 038f3e14174a00a111d489d5cf1b724275fe33da

 src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java

@@ -59,9 +59,10 @@
      // 判断同一个房屋同一个标签是否已存在，已存在则更新，不存在则新增
      QueryWrapper<HouseLabelEntity> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("house_code",houseLabel.getHouseCode())
               .eq("label_id",houseLabel.getLabelId());
         .eq("label_id",houseLabel.getLabelId());
      HouseLabelEntity one = getOne(queryWrapper);
      if (null != one){
         houseLabel.setId(one.getId());
         // 更新
         return updateById(houseLabel);
      }