Merge remote-tracking branch 'origin/master'

zhongrj

2023-11-01 f49f89760fc68ab8cd0438955c412209e925e416

 src/main/java/org/springblade/modules/house/service/IHouseholdLabelService.java

@@ -42,4 +42,10 @@
    */
   IPage<HouseholdLabelVO> selectHouseholdLabelPage(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel);

   /**
    * 住户-标签 自定义新增或修改
    * @param householdLabel
    * @return
    */
    boolean saveOrUpdateHouseholdLabel(HouseholdLabelEntity householdLabel);
}