add to model

2024-04-02 23:09:27 +03:00
parent 2c51bdc695 87c4ebe33e
commit 4c6166c907
3 changed files with 41 additions and 2 deletions
--- a/models.py
+++ b/models.py
@@ -15,11 +15,16 @@ class Auditory(db.Model):
 class Oboruds(db.Model):
    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
    invNumber=db.Column(db.Integer)
-    nazvanie=db.Column(db.String(500))
-    balancenumber = db.Column(db.String(30))
+    nazvanie=db.Column(db.String(500))    
    raspologenie = db.Column(db.String(200))
    numberved = db.Column(db.String(100))
+<<<<<<< HEAD
    kolichestvo = db.Column(db.Integer)
+=======
+    buhnumberpp = db.Column(db.String(100))      
+    kolichestvo = db.Column(db.Integer)
+    balancenumber = db.Column(db.String(30))
+>>>>>>> 87c4ebe33e69ec19b443f976557a6f5fa2905476
    aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id))