Merge branch 'release' into test

# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

@@ -191,13 +191,14 @@ public class InvoiceServiceImpl implements InvoiceService {
 //            }
             String cpy = "";
             String kcp = baseServiceConfig.getKcp();
-            boolean kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm());
+            boolean kcpMark;
             List<OrderItemInfo> cpyOrderItems = new ArrayList<OrderItemInfo>();
             List<OrderItemInfo> nocpyOrderItems = new ArrayList<OrderItemInfo>();
             for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){
                 if(StrUtil.isBlank(orderItemInfo.getSpbm())){
                     return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"第"+orderItemInfo.getSphxh()+"行商品税编为空,请补全!");
                 }else {
+                    kcpMark = kcp.contains(commonOrderInfo.getOrderItemInfo().get(0).getSpbm());
                     TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.selectTaxClassCodeBySpbm(orderItemInfo.getSpbm());
                     if(ConfigureConstant.STRING_Y.equals(taxClassCodeEntity.getCpy())){
                         //成品油明细

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

@@ -300,6 +300,9 @@
             <if test="entId != null">
                 ent_id,
             </if>
+            <if test="tswl != null">
+                tswl,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -415,6 +418,9 @@
             <if test="entId != null">
                 #{entId,jdbcType=VARCHAR},
             </if>
+            <if test="tswl != null">
+                #{tswl,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateCommodityCode" >