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

疯狂的狮子Li

2023-12-23 2a9624d404acd466c76abdb21507748ef7b63fa5

 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;