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

# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py

2023-10-11 14:56:18 +08:00

..

commons

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

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

models

材料型号同步接口修改 新增国际标准和材料应用

2023-10-09 17:35:39 +08:00

security

材料型号同步接口修改 新增国际标准和材料应用

2023-10-09 17:35:39 +08:00

static/src/scss

1.优化产品页面：

2023-09-07 17:46:22 +08:00

views

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

2023-10-11 14:56:18 +08:00

__init__.py

去掉不要的引用

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

__manifest__.py

1.优化同步cloud的静态资源库的定时器的代码

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