From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index e12ef24..e455dca 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -141,7 +141,7 @@
     /**
      * 鐩告満鎿嶆帶浼樺厛绾�
      */
-    private Integer cameraPriority;
+    private String cameraPriority;
 
     /**
      * 鐢ㄦ埛铻嶄簯token
@@ -199,11 +199,11 @@
         this.rongCloudToken = rongCloudToken;
     }
 
-    public Integer getCameraPriority() {
+    public String getCameraPriority() {
         return cameraPriority;
     }
 
-    public void setCameraPriority(Integer cameraPriority) {
+    public void setCameraPriority(String cameraPriority) {
         this.cameraPriority = cameraPriority;
     }
 

--
Gitblit v1.9.3