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

k94314517

2023-09-20 a2735382e853f89465e328dce2df9f3f465bcda9

 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);
}