Merge branch 'dev-snyx' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java

@@ -390,9 +390,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                 commodityCodeEntity.setSortId((long) i);
 
                 // 维护税编和商品编码
-                if (commodityCodeEntity != null && StringUtils.isNotBlank(commodityCodeEntity.getSsflMc())) {
+//                if (commodityCodeEntity != null && StringUtils.isNotBlank(commodityCodeEntity.getSsflMc())) {
-                    commodityCodeEntity.setSsflMc(commodityCodeEntity.getSsflMc());
+//                    commodityCodeEntity.setSsflMc(commodityCodeEntity.getSsflMc());
-                }
+//                }
                 if (commodityCodeEntity != null && StringUtils.isNotBlank(commodityCodeEntity.getSpbm())) {
                     commodityCodeEntity.setSpbm(commodityCodeEntity.getSpbm());
 //                    commodityCodeEntity.setWlflbm(commodityCodeEntity.getSpbm());