Merge branch 'pxb' into xin

xin

6 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 oying-system/src/main/java/com/oying/modules/pc/category/converter/PlatformCategoryViewAssembler.java

@@ -12,14 +12,12 @@
    public PlatformCategoryAdminView toPlatformCategoryResponse(PlatformCategory category) {
        PlatformCategoryAdminView categoryView = new PlatformCategoryAdminView();
        BeanUtil.copyProperties(category, categoryView);
        categoryView.setIconUrl("");
        return categoryView;
    }

    public PlatformCategoryCustomerView toCustomerPlatformCategoryResponse(PlatformCategory category) {
        PlatformCategoryCustomerView categoryView = new PlatformCategoryCustomerView();
        BeanUtil.copyProperties(category, categoryView);
        categoryView.setIconUrl("");
        return categoryView;
    }
}