冲突解决

code/VideoAccess-VCMP/api/app/lib/models/camera.js

@@ -246,7 +246,16 @@ module.exports = dc => {
             key: "id",
             model: "secretYingshi"
          }
-      }
+      },
+      gbId: {
+         type: DataTypes.INTEGER,
+         allowNull: true,
+         defaultValue: null,
+         comment: null,
+         primaryKey: false,
+         field: "gb_id",
+         autoIncrement: false,
+      },
    }, {
       tableName: "camera",
       comment: "",