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

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java

@@ -522,6 +522,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         RunRecording newRunRecording = new RunRecording();
 
         BeanUtils.copyProperties(flow, newRunRecording);
+        newRunRecording.setFlowVersionName(flow.getVersionName());
         newRunRecording.setTriggerTime(triggerTime);
         newRunRecording.setReRunId(runRecording.getRunId());
         newRunRecording.setRunId(reRunId);

byit-myth-core/myth-admin-core/src/main/resources/mapper/FlowStatusSnapshootMapper.xml

@@ -196,7 +196,7 @@
   <select id="exist" resultType="java.lang.Integer">
     select count(1)
     from flow_status_snapshoot
-    where 'day' = #{date} and `hour` = #{hour}
+    where `day` = #{date} and `hour` = #{hour}
   </select>
   <select id="findByTime" resultMap="BaseResultMap">
     select