jinling.yang 37b834b3cf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化 ...

# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py

2023-06-29 11:15:40 +08:00

..

controllers

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

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

data

sf刀具重构完成，同步方法测试完成

2023-06-25 16:44:10 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化

2023-06-29 11:15:40 +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