Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr into test

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -576,10 +576,10 @@
         </include>
         and pic.suspiciousfile = 0
         <if test="fromuptimeStart != null">
-            and tcp.fromuptime &gt;= ${fromuptimeStart}
+            and tcp.fromuptime &gt;= ${fromuptimeStart.value}
         </if>
         <if test="fromuptimeEnd != null">
-            and tcp.fromuptime &lt;= ${fromuptimeEnd}
+            and tcp.fromuptime &lt;= ${fromuptimeEnd.value}
         </if>
         <if test="page != null">
             <if test="page.sortname != null">
@@ -617,10 +617,10 @@
         </include>
         and pic.suspiciousfile = 0
         <if test="fromuptimeStart != null">
-            and tcp.fromuptime &gt;= ${fromuptimeStart}
+            and tcp.fromuptime &gt;= ${fromuptimeStart.value}
         </if>
         <if test="fromuptimeEnd != null">
-            and tcp.fromuptime &lt;= ${fromuptimeEnd}
+            and tcp.fromuptime &lt;= ${fromuptimeEnd.value}
         </if>
     </select>