Resolve merge conflict by incorporating both suggestions

models.py

@@ -18,6 +18,7 @@ class Oboruds(db.Model):
     nazvanie=db.Column(db.String(500))    
     raspologenie = db.Column(db.String(200))
     numberved = db.Column(db.String(100))
+<<<<<<< HEAD
 <<<<<<< HEAD
     buhnumberpp = db.Column(db.String(100))      
     kolichestvo = db.Column(db.Integer)
@@ -27,6 +28,14 @@ class Oboruds(db.Model):
     kolichestvo = db.Column(db.Integer)
 
 >>>>>>> dev
+=======
+    kolichestvo = db.Column(db.Integer)
+=======
+    buhnumberpp = db.Column(db.String(100))      
+    kolichestvo = db.Column(db.Integer)
+    balancenumber = db.Column(db.String(30))
+>>>>>>> 87c4ebe33e69ec19b443f976557a6f5fa2905476
+>>>>>>> 4c6166c9078d5d913b83b681af7f7241af0399ca
     aud_id = db.Column(db.Integer, db.ForeignKey(Auditory.id))
 
 

serve.py

@@ -0,0 +1,6 @@
+from waitress import serve
+from app import app
+
+
+if __name__ == '__main__':
+    serve(app, port='3800') 

static/js/searchonaud.js

@@ -16,9 +16,9 @@ function getData(){
 
            var data = response; 
            const table = document.getElementById('datatable')
-           table.innerHTML = ''
+   
            var headTable = '<tr> <td >Номер в Инв. вед</td> <td id="invnomer">Инв. номер</td><td>Название</td><td class="no-print aud">Аудитория</td>  <td >Расположение</td>  <td id="proverka"class="hidden-column"> Проверено</td> </tr>'
-           table.innerHTML += headTable
+
            var tr =""
 
 
@@ -33,7 +33,7 @@ function getData(){
 
                 tr += '</tr>'
             });
-            table.innerHTML += tr    
+            table.innerHTML = headTable + tr    
         }
     })
 }