diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/UserInfoServiceImpl.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/UserInfoServiceImpl.java index 7641617..2c308a8 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/UserInfoServiceImpl.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/UserInfoServiceImpl.java @@ -281,6 +281,7 @@ public class UserInfoServiceImpl extends ServiceImpl i //新增微信用户 wxUser.setAppId(wxApp.getId()); wxUser.setAppType(wxApp.getAppType()); + wxUser.setTenantId(wxApp.getTenantId()); wxUserService.saveOrUpdate(wxUser); } if(StrUtil.isNotBlank(wxUser.getMallUserId())){ diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java index 870b581..984de14 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java @@ -102,7 +102,7 @@ public enum PollutionEnum { dataWaterNhSy("dataWaterNhSy", "氨氮水样", "mg/L", "sys/icon/shebei_icon_nh3n.png", "water_live", "#225A1F", "sys/mobile/icon/shebei_icon_nh3n.png", "sys/bs/icon/shebei_icon_nh3n.png", "shebei_icon_nh3n.png"), dataWaterCodSy("dataWaterCodSy", "化学需氧量水样", "mg/L", "sys/icon/shebei_icon_cod.png", "water_live", "#FDB933", "sys/mobile/icon/shebei_icon_cod.png", "sys/bs/icon/shebei_icon_cod.png", "shebei_icon_cod.png"), - + dataStinkGas("dataStinkGas","恶臭气体","mg/m³","sys/icon/zhandian_icon_nh3.png","stink","#f47a75", "sys/mobile/icon/zhandian_icon_nh3.png", "sys/bs/icon/zhandian_icon_nh3.png", "zhandian_icon_nh3.png"), //恶臭 dataStinkOu("dataOu","臭气浓度","mg/m³","sys/icon/zhandian_icon_ou.png","stink","#f47a75", "sys/mobile/icon/shebei_icon_ou.png", "sys/bs/icon/shebei_icon_ou.png", "shebei_icon_ou.png"), dataStinkNh3("dataNh3","氨气","mg/m³","sys/icon/zhandian_icon_nh3.png","stink","#d05c7c", "sys/mobile/icon/shebei_icon_nh3.png", "sys/bs/icon/shebei_icon_nh3.png", "shebei_icon_nh3.png"),