!198 Merge remote-tracking branch 'origin/dev' into dev Merge pull request ...

疯狂的狮子Li

2022-07-12 77ac99a1d0cad1f8d48f45a6f8e2d93d29c8f105

 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java

@@ -67,7 +67,7 @@
     * 帐号状态（0正常 1停用）
     */
    @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
    @ExcelDictFormat(dictType = "sys_common_status")
    @ExcelDictFormat(dictType = "sys_normal_disable")
    private String status;

}