Merge remote-tracking branch 'origin/xin' into pxb

彭雪彬

2025-07-14 c1d20b425b10e8ba59f102dd1ab413055883eed0

 oying-system/src/main/java/com/oying/modules/pc/category/view/PlatformCategoryAdminView.java

@@ -14,6 +14,8 @@

    private Integer sortWeight;

    private Long iconId;

    private String iconUrl;

    private Integer active;