feature：物料信息invoice_name报错

order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml

@@ -931,7 +931,7 @@
                 #{tswl,jdbcType=VARCHAR},
             </if>
             <if test="invoiceName != null">
-                #{invoice_name,jdbcType=VARCHAR},
+                #{invoiceName,jdbcType=VARCHAR},
             </if>
         </trim>
     </insert>

order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml

@@ -105,6 +105,7 @@
         <bind name="dataType" value="${dataType}"/>
         <include refid="baseSelect"/>
         <where>
+            cc.xhf_nsrsbh = '-1'
             <if test="wlflbm != null and wlflbm != ''">
                 AND cc.wlflbm LIKE CONCAT('%',#{wlflbm},'%')
             </if>
@@ -117,7 +118,6 @@
             <if test="xmmc != null and xmmc != ''">
                 AND cc.merchandise_name LIKE CONCAT('%',#{xmmc},'%')
             </if>
-            AND cc.xhf_nsrsbh = '-1'
         </where>
 
         ORDER BY cc.create_time DESC