Merge remote-tracking branch 'origin/master'

server/dao/device_genre.go

@@ -4,8 +4,9 @@ import "server/global"
 
 type DeviceGenre struct {
 	global.GVA_MODEL
-	Name string `json:"name" form:"name" gorm:"comment:类型名称"`
-	Type string `json:"type" form:"type" gorm:"comment:硬件类型"`
+	Name        string `json:"name" form:"name" gorm:"comment:类型名称"`
+	Type        string `json:"type" form:"type" gorm:"comment:硬件类型"`
+	IconAddress string `json:"iconAddress" form:"iconAddress" gorm:"comment:图标地址"`
 }
 
 func (DeviceGenre) TableName() string {

web/src/utils/request.js

@@ -72,7 +72,7 @@ service.interceptors.response.use(
     if (response.headers['new-token']) {
       userStore.setToken(response.headers['new-token'])
     }
-    if (response.data.code === 0 || response.headers.success === 'true') {
+    if (response.data.code === 0 || response.headers.success === 'true' || response.status === 200) {
       if (response.headers.msg) {
         response.data.msg = decodeURI(response.headers.msg)
       }