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

xiaoyong931011

2021-09-26 3e4cfdd9da5ed748292e7da7ec42a64d0fe4b75c

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

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

    private Long parentId;

    private String image;

    private Integer isRecommend;

}