jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #220: (feature/刀具管理同步优化，增加字段 -> develop)

Browse Source 
Merge Request: 解决代码冲突


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/220?initial=true
This commit is contained in:
马广威
2023-06-29 20:00:14 +08:00
parent 1f61cf7b5a 576d2d7758
commit 1a937a7476
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_mrs_connect/models/sync_common.py
View File

@@ -1151,7 +1151,7 @@ class sfSyncCutting_tool_Material(models.Model):
class sfSyncFunctional_cutting_tool(models.Model): class sfSyncFunctional_cutting_tool(models.Model):
_inherit = 'sf.functional.cutting.tool' _inherit = 'sf.functional.cutting.tool'
_description = '功能刀具同步' _description = '功能刀具同步'
url = '/api/functional_cutting_tool/list' url = '/api/mrs_functional_cutting_tool/list'
# 定时同步每日功能刀具 # 定时同步每日功能刀具
def sync_functional_cutting_tool(self): def sync_functional_cutting_tool(self):