jinling.yang e638245b8a 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-08-08 17:18:06 +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-08 17:18:06 +08:00

security

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面展示优化

2023-07-17 16:48:44 +08:00

static/src/scss

修改设备参数以及机床型号基础参数以及同步cloud方法

2023-08-07 16:00:26 +08:00

views

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

2023-08-08 17:18:06 +08:00

__init__.py

去掉不要的引用

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

__manifest__.py

修改设备模块

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