From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/UserLogin.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/UserLogin.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/UserLogin.java
index be30a20..192dacb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/UserLogin.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/UserLogin.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonAlias;
import com.zy.acs.manager.system.service.TenantService;
import com.zy.acs.manager.system.service.UserService;
import com.zy.acs.framework.common.Cools;
@@ -75,7 +76,7 @@
* 鐧诲綍绯荤粺
*/
@ApiModelProperty(value= "鐧诲綍绯荤粺")
- private String system;
+ private String systemName;
/**
* 澶囨敞
--
Gitblit v1.9.1