Merge branch 'eta/1.4.1' into debug

models/data_manage/chart_theme/chart_theme.go

@@ -102,11 +102,12 @@ func GetAllChartThemeList() (list []*ChartTheme, err error) {
 // ChartThemeItem
 // @Description: 图表主题配置
 type ChartThemeItem struct {
-	ChartThemeId        int       `description:"图表主题类型ID" orm:"column(chart_theme_id);pk"`
-	ChartThemeName      string    `description:"图表主题名称"`
-	ChartThemeTypeId    int       `description:"图表主题类型ID"`
-	Config              string    `description:"配置"`
-	IsDelete            int       `description:"是否删除，0：未删除；1：已删除"`
+	ChartThemeId     int    `description:"图表主题类型ID" orm:"column(chart_theme_id);pk"`
+	ChartThemeName   string `description:"图表主题名称"`
+	ChartThemeTypeId int    `description:"图表主题类型ID"`
+	Config           string `description:"配置"`
+	//IsDelete            int       `description:"是否删除，0：未删除；1：已删除"`
+	IsSystemTheme       int       `description:"是否是系统主题，0：不是；1：是"`
 	SysUserId           int       `description:"操作人"`
 	SysUserRealName     string    `description:"操作人的真实名称"`
 	ModifyTime          time.Time `description:"修改时间"`