feat：优化项目信息，增加用户器材信息管理

app/common/model/manage_equipment.go

@@ -0,0 +1,34 @@
+package model
+
+import "time"
+
+// ManageEquipment 器材数据模型管理
+type ManageEquipment struct {
+	Model
+	Local
+	UID         uint64              `gorm:"column:uid;type:int;default:0;comment:用户uuid" json:"-"`
+	Kind        ManageEquipmentKind `gorm:"column:kind;type:tinyint(1);default:0;comment:器材类型" json:"kind"`
+	Code        string              `gorm:"column:code;type:varchar(30);default:null;comment:器材编号" json:"code"`
+	Title       string              `gorm:"column:title;type:varchar(100);default:null;comment:器材名称" json:"title"`
+	Params      string              `gorm:"column:params;type:varchar(255);default:null;comment:器材参数" json:"params"`
+	PurchaseAt  time.Time           `gorm:"column:purchase_at;type:datetime;default:null;comment:购买时间" json:"purchase_at"`
+	Description string              `gorm:"column:description;type:text;default:null;comment:器材描述" json:"description"`
+	ModelDeleted
+	ModelAt
+}
+
+// ManageEquipmentKind 器材类型
+type ManageEquipmentKind int
+
+const (
+	// ManageEquipmentKindForExperiment 实验器材
+	ManageEquipmentKindForExperiment ManageEquipmentKind = iota + 1
+)
+
+func (m *ManageEquipment) TableName() string {
+	return "manage_equipment"
+}
+
+func NewManageEquipment() *ManageEquipment {
+	return &ManageEquipment{}
+}

app/common/model/manage_expert.go

@@ -8,7 +8,6 @@ import (
 // ManageExpert 专家入驻信息管理
 type ManageExpert struct {
 	Model
-	ModelTenant
 	Local
 	UID uint64 `gorm:"column:uid;type:int;default:0;comment:用户uuid" json:"-"`
 	Area

app/common/model/manage_laboratory.go

@@ -7,7 +7,6 @@ import (
 // ManageLaboratory 实验室信息管理
 type ManageLaboratory struct {
 	Model
-	ModelTenant
 	Local
 	UID  uint64 `gorm:"column:uid;type:int;default:0;comment:用户uuid" json:"-"`
 	Name string `gorm:"column:name;type:varchar(30);default:null;comment:名称" json:"name"`

app/common/model/technology_equipment.go

@@ -1,21 +0,0 @@
-package model
-
-// TechnologyEquipment 技术设备管理信息
-type TechnologyEquipment struct {
-	Model
-	Local
-	UID      uint64 `gorm:"column:uid;type:int;default:0;comment:用户uuid" json:"-"`
-	Title    string `gorm:"column:title;type:varchar(30);default:null;comment:名称" json:"title"`
-	Research string `gorm:"column:research;type:varchar(255);default:null;comment:研究信息" json:"research"`
-	Describe string `gorm:"column:describe;type:varchar(255);default:null;comment:描述" json:"describe"`
-	ModelDeleted
-	ModelAt
-}
-
-func (m *TechnologyEquipment) TableName() string {
-	return m.NewTableName("technology_equipment")
-}
-
-func NewTechnologyEquipment() *TechnologyEquipment {
-	return &TechnologyEquipment{}
-}

app/common/model/user_transaction.go

@@ -3,8 +3,7 @@ package model
 // UserManageBank 用户银行卡管理
 type UserManageBank struct {
 	Model
-	ModelTenant
-	MUid      uint64                `gorm:"column:m_uid;type:int;default:0;comment:用户manage_uuid" json:"-"`
+	UID       uint64                `gorm:"column:uid;type:int;default:0;comment:用户uuid" json:"-"`
 	Name      string                `gorm:"column:name;type:varchar(30);default:null;comment:姓名" json:"name"`
 	IDCard    string                `gorm:"column:id_card;type:varchar(18);default:null;comment:身份证号" json:"id_card"`
 	BankCard  string                `gorm:"column:bank_card;type:varchar(18);default:null;comment:银行卡号" json:"bank_card"`