Merge branch 'master-vehicle-price' into dev-tiande

xx-order/xx-order-server/src/main/resources/mapper/CompanyWaterCathMapper.xml

@@ -35,10 +35,10 @@
                </choose>
             </if>
             <if test="startTime != null and startTime > 0">
-                and  wc.crt_time > = {startTime}
+                and  wc.crt_time > = #{startTime}
             </if>
             <if test="endTime != null and endTime > 0">
-                and  wc.crt_time &lt;= {endTime}
+                and  wc.crt_time &lt;= #{endTime}
             </if>
             <if test="dataCompanyIds != null and dataCompanyIds.size() > 0">
                 and wc.company_id= in

xx-order/xx-order-server/src/main/resources/mapper/CompanyWaterDetailMapper.xml

@@ -24,10 +24,10 @@
                 and  d.branch_id=#{branchId}
             </if>
             <if test="startTime != null and startTime > 0">
-                and  d.crt_time > = {startTime}
+                and  d.crt_time > = #{startTime}
             </if>
             <if test="endTime != null and endTime > 0">
-                and  d.crt_time &lt;= {endTime}
+                and  d.crt_time &lt;= #{endTime}
             </if>
             <if test="dataCompanyIds != null and dataCompanyIds.size() > 0">
                 and d.company_id= in