Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 cloud-server-other/src/main/java/com/dsh/other/service/HonorRulesService.java

@@ -17,4 +17,7 @@

    List<HonorRules> querylistOfIds(List<Integer> honorIds);

    List<HonorRules> getList();

    List<HonorRules> selectByType(Integer type1);
}