Merge branch 'xjjdev'

pkg/db/init.go

@@ -6,8 +6,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/fonchain/fonchain-artistinfo/cmd/model/old"
-
 	"github.com/fonchain/fonchain-artistinfo/cmd/model"
 	"github.com/fonchain/fonchain-artistinfo/pkg/m"
 	"github.com/gin-gonic/gin"
@@ -104,19 +102,19 @@ func Database(conn string) {
 func migration() {
 	//自迁移模式
 	err := DB.AutoMigrate(
-		//&old.Bank{},
+		// &old.Bank{},
+		// &old.Artwork{},
+		// &model.Contract{},
+		// &model.SupplyInfo{},
+		// &model.ExhVideo{},
+		// &model.ExhExam{},
+		// &old.ArtistInfo{},
+		// &old.ArtworkState{},
+		// &old.ArtworkBatch{},
 		&model.RealName{},
 		&model.User{},
 		&model.Invite{},
-		&old.Artwork{},
-		//&model.Contract{},
-		//&model.SupplyInfo{},
-		//&model.ExhVideo{},
-		//&model.ExhExam{},
-		&old.ArtistInfo{},
 		&model.UserInvited{},
-		&old.ArtworkState{},
-		&old.ArtworkBatch{},
 		&model.TempArtistInfo{},
 		&model.ArtworkLockRecord{},
 		&model.ArtshowVideoRecord{},      //画展视频记录