Merge remote-tracking branch 'origin/5.X' into 5.X

疯狂的狮子Li

2024-07-09 367d739e2d54b930e86a646f22711322b8bd1879

 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java

@@ -25,7 +25,7 @@
    private static final long serialVersionUID = 1L;

    /**
     * 主建
     * 主键
     */
    private Long ossConfigId;