解决代码冲突
This commit is contained in:
@@ -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):
|
||||||
|
|||||||
Reference in New Issue
Block a user