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

xin

2025-07-16 0526acc407572d23b1030e0ffd842406ae0bc121

 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;