Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

4 天以前 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4

 src/main/resources/mapper/productionPlan/ProductionPlanMapper.xml

@@ -68,6 +68,7 @@
        <if test="c.endDate != null">
            AND pp.end_date &lt;= DATE_FORMAT(#{c.endDate},'%Y-%m-%d')
        </if>
        ORDER BY pp.id DESC
    </select>

    <select id="selectSummaryByProductType" resultType="com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto">