Merge remote-tracking branch 'origin/master'

cy

2023-10-27 8ec414eb3a5173c1f53bd33b73519c78ca79938a

 consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java

@@ -94,8 +94,8 @@
        }
        //状态
        if (param.getStates() != null) {
            sql.append(" and status =:status ");
            paramts.put("status", param.getStates());
            sql.append(" and states =:states ");
            paramts.put("states", param.getStates());
        } else {
            sql.append(" and states !=3 ");
        }