qihao.gong@jikimo.com 43d6794151 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug ...

# Conflicts:
#	sf_base/views/base_view.xml
#	sf_mrs_connect/models/sync_common.py

2023-08-18 14:34:37 +08:00

..

controllers

制造订单，产品，工单上进行3d模型展示

2023-03-09 17:34:44 +08:00

data

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

2023-08-17 18:03:12 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

2023-08-18 14:34:37 +08:00

views

解决冲突

2023-06-12 14:35:14 +08:00

__init__.py

212

2022-11-21 20:04:56 +08:00

__manifest__.py

去掉警告及开发表面工艺相关需求

2023-03-27 21:04:33 +08:00