Merge remote-tracking branch 'origin/bugfix_3066' into release

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

@@ -97,7 +97,8 @@
         cc.wlflmc,
         cc.ent_id,
         cc.tswl,
-        cc.invoice_name
+        cc.invoice_name,
+        cc.encoding
         FROM
         commodity_code cc LEFT JOIN group_commodity gc
         ON gc.id = cc.group_id
@@ -160,6 +161,12 @@
             <if test="map.tswl != null and map.tswl != ''">
                 AND cc.tswl = #{map.tswl,jdbcType=VARCHAR}
             </if>
+            <if test="map.encoding != null and map.encoding != ''">
+                AND cc.encoding like concat('%',#{map.encoding,jdbcType=VARCHAR},'%')
+            </if>
+            <if test="map.specificationModel != null and map.specificationModel != ''">
+                AND cc.specification_model like concat('%',#{map.specificationModel,jdbcType=VARCHAR},'%')
+            </if>
             <if test="dataType == 0">
                 <choose>
                     <!--模糊查询的标识(0表示不进行模糊查询，1表示模糊查询)-->