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

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

@@ -687,7 +687,7 @@ public class CommodityController {
            //0-集团共享；1-手工创建；2-模板导入；3-采集下级；4；MDM推送
             commodityExcel.setDataSource("");
             if(StringUtils.isNotBlank(commodityCodeEntity.getDataSource())){
-                CommodityCodeEnum codeValue = CommodityCodeEnum.getCodeValue(commodityCodeEntity.getDataSource());
+                TaxClassCodeEnum codeValue = TaxClassCodeEnum.getCodeValue(commodityCodeEntity.getDataSource());
                 commodityExcel.setDataSource(codeValue.getValue());
             }
 

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java

@@ -641,6 +641,7 @@ public class UserInfoServiceImpl implements UserInfoService {
                     taxPlayerCodeDept.setTaxpayerPhone(groupManagementEntity.getXhfDh());
                     taxPlayerCodeDept.setTaxpayerBank(groupManagementEntity.getXhfYh());
                     taxPlayerCodeDept.setTaxpayerAccount(groupManagementEntity.getXhfZh());
+                    taxPlayerCodeDept.setDeptType(Integer.valueOf(ConfigureConstant.STRING_10));
                 }
             });
         }