Merge branch 'xjjdev' into dev

cmd/internal/dao/artistinfo_artwork.go

@@ -151,7 +151,7 @@ func GetArtworkLockRecords(req *artistInfoArtwork.GetArtworkLockRecordsRequest)
 		if req.BaseAuditStatus == 2 {
 			//现要求暂存的画作也支持在待审核列表展示和审批
 			tx = tx.Where("base_audit_status = ? OR base_audit_status =1", req.BaseAuditStatus)
-		} else {
+		} else if req.BaseAuditStatus != 1 { //排除暂存状态
 			tx = tx.Where("base_audit_status = ?", req.BaseAuditStatus)
 		}