Merge branch 'release' into test

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java

@@ -528,7 +528,7 @@ public class CommodityController {
                 }
                 commodityCodeEntity.setSl(sl);
 
-                String ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(commodityExcel.getGgxh());
+                String ggxh = BaseServiceBeanTransitionUtils.ggxhTransition(StringUtils.isBlank(commodityExcel.getGgxh())?"":commodityExcel.getGgxh());
                 commodityCodeEntity.setGgxh(ggxh);
                 commodityCodeEntity.setXmdw(StringUtils.isEmpty(commodityExcel.getDw()) ? "" : commodityExcel.getDw());
                 commodityCodeEntity.setXmdj(StringUtils.isEmpty(commodityExcel.getDj()) ? "" : commodityExcel.getDj());