From 6c6f51954fbb51f335d3d32f63101c5a602e7a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= <lilong@axzo.cn>
Date: Wed, 20 Nov 2024 13:49:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20(feature/REQ-3167)=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0ios?=
 =?UTF-8?q?=EF=BC=8Candroid=E7=89=88=E6=9C=AC=E5=AD=97=E6=AE=B5=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tyr/client/model/res/PageElementResp.java | 32 +++++++++++++++++++
 .../repository/entity/SaasPageElement.java    |  4 +--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/PageElementResp.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/PageElementResp.java
index 8fae72f1..c2240fe4 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/PageElementResp.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/PageElementResp.java
@@ -64,7 +64,9 @@ public class PageElementResp {
 
     /**
      * 客户端版本号
+     * 已经废弃
      */
+    @Deprecated
     private Integer version;
 
     /**
@@ -95,6 +97,36 @@ public class PageElementResp {
     /** android挑战地址 **/
     private String androidRouterUrl;
 
+    /**
+     * ios 最低版本要求
+     */
+    private Integer iosMinVersion;
+
+    /**
+     * ios 最高版本要求
+     */
+    private Integer iosMaxVersion;
+
+    /**
+     * ios 是否开启最高版本要求:true-开启；false-关闭
+     */
+    private Boolean iosMaxVersionEnabled;
+
+    /**
+     * android 最低版本要求
+     */
+    private Integer androidMinVersion;
+
+    /**
+     * android 最高版本要求
+     */
+    private Integer androidMaxVersion;
+
+    /**
+     * android 是否开启最高版本要求:true-开启；false-关闭
+     */
+    private Boolean androidMaxVersionEnabled;
+
     @Data
     @Builder
     @NoArgsConstructor
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java
index 5c3b839b..0015fe7f 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java
@@ -137,12 +137,12 @@ public class SaasPageElement extends BaseEntity<SaasPageElement> {
         /**
          * 最低版本要求
          */
-        private Long minVersion;
+        private Integer minVersion;
 
         /**
          * 最高版本要求
          */
-        private Long maxVersion;
+        private Integer maxVersion;
 
         /**
          * 是否开启最高版本要求:true-开启；false-关闭