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

jiangping

2024-10-17 14b70bacd63f6b136612cf70b160777142e2a996

 server/service/src/main/java/com/doumee/service/business/BaseCategoryService.java

@@ -103,4 +103,6 @@
     * @return long
     */
    long count(BaseCategory baseCategory);

    void updateDisableById(BaseCategory category);
}