Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品验证

# Conflicts: # sf_manufacturing/models/stock.py # sf_wxwork_approval/models/model.py
2023-11-20 15:11:43 +08:00
parent 04e63dcc59 b093b11ec2
commit 6912160232
24 changed files with 142 additions and 287 deletions
--- a/sf_wxwork_approval/models/model.py
+++ b/sf_wxwork_approval/models/model.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import re
 import logging
 from odoo import fields, models

@@ -32,9 +31,3 @@ class WxWorkApproval(models.Model):
    # ], string='请假类型')
    # leave_days = fields.Float(string='Leave Days')
    # overtime_hours = fields.Float(string='Overtime Hours')
-
-
-
-
-
-