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

# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py

2023-10-11 14:56:18 +08:00

..

equipment_maintenance_standards_views.xml

修改维保生成编码和名称的规则

2023-09-26 17:29:14 +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-10-11 14:56:18 +08:00