Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/java/com/zc/business/service/impl/DcEventTypeServiceImpl.java

@@ -35,7 +35,10 @@ public class DcEventTypeServiceImpl implements IDcEventTypeService
     @Override
     public DcEventType selectDcEventTypeByEventType(Integer eventType)
     {
-        return dcEventTypeMapper.selectDcEventTypeByEventType(eventType);
+        DcEventType dcEventType = dcEventTypeMapper.selectDcEventTypeByEventType(eventType);
+        List<DcProcessConfig> configList = dcProcessConfigMapper.selectDcProcessConfigByEventType(eventType);
+        dcEventType.setProcessConfigList(configList);
+        return dcEventType;
     }
 
     /**