Merge remote-tracking branch 'origin/sqd' into sqd

maven

2 天以前 83a2ac0bbf44d550a4d0add970d14623298a8574

 src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml

@@ -116,10 +116,7 @@
                AND T3.invoice_date <= date_format(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d')
            </if>
            <if test="invoiceRegistrationProductDto.createTimeStart != null ">
                AND T1.create_time &gt;= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')
            </if>
            <if test="invoiceRegistrationProductDto.createTimeEnd != null ">
                AND T1.create_time &lt;= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')+interval 1 day
                AND T1.create_time like CONCAT(#{invoiceRegistrationProductDto.createTimeStart}, '%')
            </if>
        </where>
        ORDER BY T1.create_time DESC