Merge branch 'ETA_1.8.1' into debug

controllers/smart_report/smart_resource.go

@@ -167,8 +167,9 @@ func (this *SmartReportResourceController) Rename() {
 		return
 	}
 
-	cols := []string{"ImgName"}
+	cols := []string{"ImgName","Style"}
 	item.ImgName = req.ImgName
+	item.Style = req.Style
 
 	if e = item.Update(cols); e != nil {
 		br.Msg = "操作失败"

models/smart_report/smart_resource.go

@@ -86,6 +86,7 @@ func (m *SmartReportResource) GetPageItemsByCondition(condition string, pars []i
 type SmartReportRenameReq struct {
 	ResourceId int    `description:"资源ID"`
 	ImgName    string `description:"图片名称"`
+	Style      string `description:"版图样式"`
 }
 
 func (m *SmartReportResource) GetItemById(id int) (item *SmartReportResource, err error) {