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

xin

2025-07-14 a5a0a3c29a97c807cda8846994d1d8df6adeb9e5

 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;