Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

xiaoyong931011

2021-09-27 5ebe08326ec43936d127bf704f3853adaf7b01c9

 src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCategoryVo.java

@@ -13,6 +13,8 @@

    private Long parentId;

    private String image;

    private Integer isRecommend;

}