1.水源bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -600,7 +600,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		List<Map<String, Object>> list = this.baseMapper.selectPersonList(map);
 		//处理循环中的远程调用（原有逻辑不变）
 		List<String> amosIds = new ArrayList<>();
-		list.stream().forEach(t -> {
+		list.forEach(t -> {
 			// BUG2886 因为前期沟通 人员code 可能会发生改变 所以 现在接口code 不再保存，查询数据时通过接口重新赋值 by kongfm
 			// 2021-09-16
 			if (null != t.get("amosOrgId") && StringUtils.isNotEmpty(t.get("amosOrgId").toString())) {

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml

@@ -1603,6 +1603,7 @@
         wes.id,
         wes.name,
         wes.position,
+        wes.code,
         wes.equipment_code equipmentCode,
         wes.realtime_iot_index_name realtimeIotIndexName,
         wes.realtime_iot_index_key realtimeIotIndexKey,