Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-01-17 8052d759570bcf6a01aac55733365c8c306623a4

 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;

    /**