合并代码

2022-11-07 11:21:31 +08:00
parent 84cf25f39d
commit 8776fc7d6c
4 changed files with 9 additions and 22 deletions
--- a/sf_route_workcenter/models/workcenter.py
+++ b/sf_route_workcenter/models/workcenter.py
@@ -8,15 +8,8 @@ import qrcode

 from io import BytesIO
 from odoo import api, fields, models
-<<<<<<< HEAD
-
 from pystrich.code128 import Code128Encoder
-=======
-import barcode
-# from barcode.writer import ImageWriter
-# from pystrich.code128 import Code128Encoder
->>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
-from odoo.exceptions import UserError
+

 _logger = logging.getLogger(__name__)