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

jiaosong

2023-09-19 9c20f268e0628017d09427989724cdf2a8e9e8e2

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

@@ -48,7 +48,7 @@
     *
     * @param baseCategory 实体对象
     */
    void updateById(BaseCategoryRequest baseCategory);
    void update(BaseCategoryRequest baseCategory);

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

    void updateDisableById(BaseCategory category);
}