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

liding

6 天以前 db85e062349683b3131726fe90dcc99d4aff35ba

 src/main/resources/mapper/production/ProductionProductInputMapper.xml

@@ -4,7 +4,7 @@

    <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductionProductInput">
        <id property="id" column="id"/>
        <result property="productionProductId" column="production_product_id"/>
        <result property="productMainId" column="product_main_id"/>
        <result property="productModelId" column="product_model_id"/>
        <result property="quantity" column="quantity"/>
        <result property="tenantId" column="tenant_id"/>