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

..

commons

代码规范整理，产品页面模型和胚料的模型类型字段做显示

2023-02-09 15:26:08 +08:00

models

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

2023-08-17 18:09:19 +08:00

security

移除托盘对象 并清除所有关联关系

2023-08-17 16:33:40 +08:00

static/src/scss

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

2023-08-17 10:13:19 +08:00

views

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

__init__.py

去掉不要的引用

2023-07-17 17:35:55 +08:00

__manifest__.py

修改设备模块

2023-07-28 15:33:31 +08:00