jinling.yang 5ffe2ce0e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） ...

# Conflicts:
#	sf_maintenance/views/maintenance_views.xml

2023-10-30 10:48:13 +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/刀具产品调取Cloud刀具标准库（10.11）

2023-10-30 10:48:13 +08:00

security

同步刀具标准库

2023-10-19 10:49:54 +08:00

static/src/scss

新增规格改变事件

2023-10-25 17:37:17 +08:00

views

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

2023-10-30 10:48:13 +08:00

__init__.py

去掉不要的引用

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

__manifest__.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

2023-10-24 09:45:35 +08:00