Merge branch 'release' into test

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

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java

@@ -158,7 +158,8 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
             }else{
                 newCommodityCodeEntity.setId(baseService.getGenerateShotKey());
                 newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh());
-                newCommodityCodeEntity.setDataState(TaxClassCodeEnum.DATA_SOURCE_9.getKey());
+                newCommodityCodeEntity.setDataSource(TaxClassCodeEnum.DATA_SOURCE_9.getKey());
+                newCommodityCodeEntity.setDataState(ConfigureConstant.STRING_0);
                 newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc());
                 newCommodityCodeEntity.setHsbz(ConfigureConstant.STRING_1);
                 newCommodityCodeEntity.setYhzcbs(ConfigureConstant.STRING_0);