Authored by Lixiaodi

Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5

... ... @@ -22,7 +22,7 @@
</if>
AND create_time &gt;= #{startTime, jdbcType=INTEGER}
AND create_time &lt; #{endTime, jdbcType=INTEGER}
<if test="sizeId = null or sizeId =''">
<if test="sizeId == null or sizeId == ''">
GROUP BY product_id, create_time
</if>
ORDER BY create_time ASC
... ...
... ... @@ -23,7 +23,7 @@
</if>
AND create_time &gt;= #{startTime, jdbcType=INTEGER}
AND create_time &lt; #{endTime, jdbcType=INTEGER}
<if test="sizeId = null or sizeId =''">
<if test="sizeId == null or sizeId == ''">
GROUP BY product_id, create_time
</if>
ORDER BY create_time ASC
... ...
... ... @@ -23,7 +23,7 @@
</if>
AND create_time &gt;= #{startTime, jdbcType=INTEGER}
AND create_time &lt; #{endTime, jdbcType=INTEGER}
<if test="sizeId = null or sizeId =''">
<if test="sizeId == null or sizeId == ''">
GROUP BY product_id, create_time
</if>
ORDER BY create_time ASC
... ...
... ... @@ -23,7 +23,7 @@
</if>
AND create_time &gt;= #{startTime, jdbcType=INTEGER}
AND create_time &lt; #{endTime, jdbcType=INTEGER}
<if test="sizeId = null or sizeId =''">
<if test="sizeId == null or sizeId == ''">
GROUP BY product_id, create_time
</if>
ORDER BY create_time ASC
... ...
... ... @@ -5,6 +5,6 @@
<configuration>
<settings>
<setting name="defaultStatementTimeout" value="10"/> <!-- seconds -->
<setting name="logImpl" value="STDOUT_LOGGING" />
<setting name="logImpl" value="STDOUT_LOGGING" /> <!-- 在控制台打印sql语句 -->
</settings>
</configuration>
\ No newline at end of file
... ...