From 31d3591b34d4f26ad2ab207ca3044048d9adb9df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 17:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java
index 549786a..7be45e7 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
import org.springframework.data.mongodb.core.annotation.Collation;
@@ -11,7 +12,7 @@
*/
@Data
@Collation("py_osd")
-public class PyOsdResult {
+public class PyOsdResult extends BaseResult {
/**
* 鍥芥爣鐮�
@@ -80,32 +81,32 @@
/**
* osd1鐪�
*/
- private String osd1Province;
+ private Integer osd1Province;
/**
* osd1甯�
*/
- private String osd1City;
+ private Integer osd1City;
/**
* osd1鍖�
*/
- private String osd1Part;
+ private Integer osd1Part;
/**
* osd1 宸︿笅瑙�
*/
- private String osd1LB;
+ private Integer osd1LB;
/**
* osd1_osd
*/
- private String osd1OSD;
+ private Integer osd1OSD;
/**
* osd1_鏃堕棿鏍煎紡鏄惁姝ｇ‘
*/
- private String osd1TimeFormat;
+ private Integer osd1TimeFormat;
/**
* osd1_鐪佽缃�
@@ -130,7 +131,7 @@
/**
* osd1_osd璁剧疆
*/
- private String osd1OsdSet;
+ private Integer osd1OsdSet;
/**
* osd1 鏃堕棿鏍煎紡
--
Gitblit v1.8.0