Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 046b00bc34aeb1390a76df60cbc7ff65172efa52
+  newTag: b8c359c50b12a19eaae8384dd15756ceddbd7d17

src/pages/categoryManage/serviceCategoryList/index.tsx

@@ -79,7 +79,9 @@ function ServiceCategoryList() {
         if (res && res.code === '200') {
           message.success('删除成功');
           paginationChange(
-            tableData.length === 1 ? pagination.current - 1 : pagination.current,
+            tableData.length === 1 && pagination.current > 1
+              ? pagination.current - 1
+              : pagination.current,
             pagination.pageSize,
           );
         }