Merge branch 'pre' into gas

dev-discount
胡锐 2 years ago
commit 27d55c471e
  1. 2
      hai-bweb/src/main/java/com/bweb/controller/HighGasController.java

@ -750,10 +750,10 @@ public class HighGasController {
} }
if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) { if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) {
param.put("companyId", userInfoModel.getBsCompany().getId());
param.put("merId", merId); param.put("merId", merId);
} else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type1.getType())) { } else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type1.getType())) {
param.put("companyId", userInfoModel.getBsCompany().getId());
param.put("merId", merId); param.put("merId", merId);
} else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type2.getType())) { } else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type2.getType())) {

Loading…
Cancel
Save