cdf8e7227ca8c94549f8cc7ceca0c6c0cc1a78ee
# Conflicts: # sf_maintenance/views/equipment_maintenance_standards_views.xml 增加owl监听必填标识功能
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
#jikimo_sf
Description