Merge remote-tracking branch 'origin/dev' into dev

xlsea

2024-12-16 4d566071db7853c66805a1ffac2fd9c93a6aac8a

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

@@ -34,11 +34,6 @@
    private String dictType;

    /**
     * 状态（0正常 1停用）
     */
    private String status;

    /**
     * 备注
     */
    private String remark;