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/impl/HonorRulesServiceImpl.java

@@ -34,6 +34,6 @@
    public List<HonorRules> selectByType(Integer type1) {
        QueryWrapper<HonorRules> wrapper = new QueryWrapper<>();

        return this.baseMapper.selectList(wrapper.eq("type",type1));
        return this.baseMapper.selectList(wrapper.eq("type", type1));
    }
}