Merge branch 'master' of https://git.steerinfo.com/caol/jg_wzjl_api.git

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3470,6 +3470,9 @@
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="whereLike"/>
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
     <if test="flag != null and flag != ''">
       and value_flag != '0'
     </if>