qihao.gong@jikimo.com 0de26c4f2f 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-09-15 14:27:16 +08:00

..

equipment_maintenance_standards_views.xml

处理机床能力数据

2023-09-13 14:32:32 +08:00

maintenance_logs_views.xml

设备新增图文展示table

2023-09-01 16:57:04 +08:00

maintenance_request_views.xml

处理机床能力数据

2023-09-13 14:32:32 +08:00

maintenance_views.xml

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

2023-09-15 14:27:16 +08:00