yuxianghui be0f62ffe0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理 ...

# Conflicts:
#	sf_base/models/fixture.py
#	sf_manufacturing/models/model_type.py
#	sf_manufacturing/models/product_template.py
#	sf_sale/models/quick_easy_order.py

2023-08-29 11:21:13 +08:00

..

__init__.py

产品模板的型号手动输入时型号对象的编码，联装类型，夹具物料字段的值显示

2023-08-25 15:46:41 +08:00

base.py

去掉警告

2023-08-29 10:22:12 +08:00

common.py

1.模型为上色Bug修复（cloud代码注释引起）

2023-08-28 17:40:19 +08:00

fixture.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理

2023-08-29 11:21:13 +08:00

functional_fixture.py

去掉警告

2023-08-29 10:22:12 +08:00

tool_base_new.py

所有自建模块日志警告信息处理

2023-08-29 11:06:59 +08:00

tool_base.py

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

2023-08-15 17:31:49 +08:00