Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server into dev

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsCategoryMgrController.java

@@ -63,7 +63,6 @@ public class GoodsCategoryMgrController extends BaseApiController {
    * @return
    */
   @PostMapping("/items")
-  @PreAuthorize("@ss.hasPermi('business:category:list')")
   public AjaxResult items(@RequestBody JSONObject param) {
     List<GoodsCategory> categoryList = goodsCategoryService.list(
         new LambdaQueryWrapper<GoodsCategory>().orderByDesc(GoodsCategory::getSort));
@@ -153,7 +152,7 @@ public class GoodsCategoryMgrController extends BaseApiController {
       return error(ErrorCodeEnum.ERROR_CODE_1001);
     }
     int cnt = goodsService.count(new LambdaQueryWrapper<Goods>()
-        .eq(Goods::getCategoryId, goodsCategory.getCategoryId()).eq(Goods::getIsDeleted, 1));
+        .eq(Goods::getCategoryId, goodsCategory.getCategoryId()).eq(Goods::getIsDeleted, 0));
     if (cnt > 0) {
       return error(ErrorCodeEnum.ERROR_CODE_1024);
     }

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsTagMgrController.java

@@ -66,7 +66,6 @@ public class GoodsTagMgrController extends BaseApiController {
    * @return
    */
   @PostMapping("/items")
-  @PreAuthorize("@ss.hasPermi('business:tag:list')")
   public AjaxResult items(@RequestBody JSONObject param) {
     List<GoodsTag> tagList = goodsTagService.list(new LambdaQueryWrapper<GoodsTag>().orderByDesc(GoodsTag::getSort));
     return AjaxResult.success(tagList);