更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoServeModel.java

@@ -13,7 +13,7 @@ import lombok.Data;
 @Data
 public class DeviceInfoServeModel extends DeviceInfoModel {
 
-    @Schema(description = "收款结构信息")
+    @Schema(description = "收款机构信息")
     private OrganizationPayInfoModel payOrgInfo;
 
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceInfoServiceImpl.java

@@ -321,6 +321,11 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
         return model;
     }
 
+    /**
+     * 设备包含的 商品、、收款机构等信息 转换
+     * @param entity
+     * @return
+     */
     public DeviceInfoServeModel toServeModel(DeviceInfo entity) {
         DeviceInfoServeModel model = null;
         if (ObjectUtils.isNotEmpty(entity)) {
@@ -457,7 +462,7 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
      * @return
      */
     public OrganizationPayInfoModel getDeviceReceiveOrgInfo(String deviceId) {
-        DeviceInfo deviceInfo = deviceInfoDao.findTopById(deviceId);
+        DeviceInfo deviceInfo = deviceInfoDao.findTopByDeviceId(deviceId);
         if (ObjectUtils.isEmpty(deviceInfo)) {
             return null;
         }