jinling.yang b02cb16dc9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化 ...

# Conflicts:
#	sf_tool_management/__manifest__.py
#	sf_tool_management/views/tool_base_views.xml

2023-06-28 18:34:39 +08:00

..

models

Merge branch refs/heads/develop into refs/heads/feature/设备维保

2023-06-28 10:39:23 +08:00

security

Merge branch refs/heads/develop into refs/heads/feature/设备维保

2023-06-28 10:39:23 +08:00

views

刀具产品页面刀具物料及型号字段修改

2023-06-28 18:32:45 +08:00

wizard

优化了功能刀具管理的代码

2023-06-28 10:02:59 +08:00

__init__.py

Merge branch refs/heads/develop into refs/heads/feature/设备维保

2023-06-28 10:39:23 +08:00

__manifest__.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化

2023-06-28 18:34:39 +08:00