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

# Conflicts:
#	sf_maintenance/views/maintenance_views.xml

2023-08-24 15:00:41 +08:00

..

equipment_maintenance_standards_views.xml

修改设备模块

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

maintenance_logs_views.xml

优化机场看板以及机床表单

2023-08-17 11:11:47 +08:00

maintenance_request_views.xml

修改维保table

2023-08-21 17:22:53 +08:00

maintenance_views.xml

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

2023-08-24 15:00:41 +08:00