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

liyong

16 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

 src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml

@@ -171,7 +171,7 @@
    </select>

    <select id="getSumQuantity" resultType="BigDecimal">
        select sum(inbound_num)
        select COALESCE(sum(inbound_num), 0)
        from procurement_record_out
        where type = 1
          and product_model_id = #{productModelId}