Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增销售权限

# Conflicts: # sf_bf_connect/models/process_status.py
2023-11-21 16:11:24 +08:00
parent 6ec6094c5e 321c40d31d
commit 6738f38131
7 changed files with 58 additions and 57 deletions
--- a/sf_bf_connect/models/process_status.py
+++ b/sf_bf_connect/models/process_status.py
@@ -3,6 +3,7 @@ import logging
 import requests
 from odoo import fields, models

+
 _logger = logging.getLogger(__name__)