1112

models.py

@@ -18,13 +18,21 @@ class Oboruds(db.Model):
     nazvanie=db.Column(db.String(500))    
     raspologenie = db.Column(db.String(200))
     numberved = db.Column(db.String(100))
+<<<<<<< HEAD
     buhnumberpp = db.Column(db.String(100))      
     kolichestvo = db.Column(db.Integer)
     balancenumber = db.Column(db.String(30))
+=======
+    numberppasu = db.Column(db.String(100))
+    kolichestvo = db.Column(db.Integer)
+
+>>>>>>> dev
     aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id))
 
 
 
+
+
 class Zametki(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     txtzam=db.Column(db.String(10000))