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

疯狂的狮子li

2022-01-13 6ca853516671882e8e54d9630a4299f12fbcf9aa

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java

@@ -70,7 +70,7 @@
     */
    @ApiModelProperty(value = "系统内置（Y是 N否）")
    @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
   @ExcelDictFormat(dictType = "sys_yes_no")
    @ExcelDictFormat(dictType = "sys_yes_no")
    private String configType;

    /**