Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

 src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml

@@ -92,6 +92,12 @@
        <if test="stockrecord.deptId != null and stockrecord.deptId !=''">
            and st.dept_id = #{stockrecord.deptId}
        </if>
        <if test="stockrecord.startTime!=null and stockrecord.startTime!=''">
            and st.create_time &gt;= #{stockrecord.startTime}
        </if>
        <if test="stockrecord.endTime!=null and stockrecord.endTime!=''">
            and st.create_time &lt;= #{stockrecord.endTime}
        </if>
        ORDER BY st.create_time desc
    </select>