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

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 58dee479ce3f13d2891a5747c3df9f1b44ec1fa6
+  newTag: 9634dc7913c7d23a8ee8ca08d712ac455192da8f

src/main/java/com/mmc/pms/controller/category/CategoryController.java

@@ -73,7 +73,6 @@ public class CategoryController {
         return categoryService.addSubCategory(subVO);
     }
 
-
     @ApiOperation(value = "二级分类————编辑")
     @PostMapping("/updateSubCategory")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})

src/main/resources/mapper/category/CategoryDao.xml

@@ -26,6 +26,7 @@
                update_time         AS updateTime
         from category_sub
         where category_primary_id = #{categoryPrimaryId}
+        order by create_time desc
     </select>
 
     <select id="categoryListCount" resultType="int" parameterType="com.mmc.pms.model.category.qo.CategoryQO">