Merge remote-tracking branch 'origin/master'

maven

22 小时以前 9fb6f5adf9f63deffd377c001aaab8ffeae4c742

 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml

@@ -171,7 +171,7 @@
                AND T1.payment_date >= date_format(#{params.paymentDateStart},'%Y-%m-%d')
            </if>
            <if test="params.paymentDateEnd != null and params.paymentDateEnd !='' ">
                AND T1.payment_date &lt; date_format(#{params.paymentDateEnd},'%Y-%m-%d')
                AND T1.payment_date &lt;= date_format(#{params.paymentDateEnd},'%Y-%m-%d')
            </if>
        </where>
        ORDER BY T1.payment_date,T1.create_time DESC