diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsCategoryController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsCategoryController.java index dbcd03d2..2a89e0c9 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsCategoryController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsCategoryController.java @@ -108,10 +108,8 @@ public class GoodsCategoryController extends BaseController { @RequiresPermissions("goods:goods:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(GoodsCategory category) { - startPage(); - List list = goodsCategoryService.selectGoodsCategoryList(category); - return getDataTable(list); + public List list(GoodsCategory category) { + return goodsCategoryService.selectGoodsCategoryList(category); } /** diff --git a/ghy-admin/src/main/resources/templates/goods/category/category.html b/ghy-admin/src/main/resources/templates/goods/category/category.html new file mode 100644 index 00000000..96083cd2 --- /dev/null +++ b/ghy-admin/src/main/resources/templates/goods/category/category.html @@ -0,0 +1,112 @@ + + + + + + +
+
+
+
+
+
    +
  • + 类目名称： +
    • +
  • + 类目状态： +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsCategory.java b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsCategory.java index 3314bb4a..a7ea6c59 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsCategory.java +++ b/ghy-goods/src/main/java/com/ghy/goods/domain/GoodsCategory.java @@ -36,5 +36,8 @@ public class GoodsCategory extends BaseEntity { @Excel(name = "类别类型. 1.服务类 2.商品类", cellType = Excel.ColumnType.STRING) private String type; + @Excel(name = "状态") + private Integer status; + }