From 324914bbc8f6342170ce2d3041af7f9f0ead535a Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 23 三月 2026 13:17:35 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/userLogin/UserLoginList.jsx | 6 +++---
zy-acs-flow/src/page/userLogin/UserLoginPanel.jsx | 4 ++--
zy-acs-flow/src/i18n/en.js | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java | 1 +
zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/UserLogin.java | 3 ++-
zy-acs-flow/src/i18n/zh.js | 2 +-
zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx | 4 ++--
zy-acs-flow/src/page/userLogin/UserLoginEdit.jsx | 4 ++--
8 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index bdcb8a7..307ac1f 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -188,7 +188,7 @@
token: "token",
ip: "ip",
type: "type",
- system: "system",
+ systemName: "system",
},
dept: {
name: "name",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 1481c59..3448f6b 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -188,7 +188,7 @@
token: "token",
ip: "ip",
type: "绫诲瀷",
- system: "绯荤粺",
+ systemName: "绯荤粺",
},
dept: {
name: "閮ㄩ棬鍚嶇О",
diff --git a/zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx b/zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx
index 7bd23f1..9519e91 100644
--- a/zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx
+++ b/zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx
@@ -119,8 +119,8 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.userLogin.system"
- source="system"
+ label="table.field.userLogin.systemName"
+ source="systemName"
parse={v => v}
/>
</Grid>
diff --git a/zy-acs-flow/src/page/userLogin/UserLoginEdit.jsx b/zy-acs-flow/src/page/userLogin/UserLoginEdit.jsx
index c6c1f34..ec8e626 100644
--- a/zy-acs-flow/src/page/userLogin/UserLoginEdit.jsx
+++ b/zy-acs-flow/src/page/userLogin/UserLoginEdit.jsx
@@ -97,8 +97,8 @@
source="type"
/>
<TextInput
- label="table.field.userLogin.system"
- source="system"
+ label="table.field.userLogin.systemName"
+ source="systemName"
parse={v => v}
/>
</Stack>
diff --git a/zy-acs-flow/src/page/userLogin/UserLoginList.jsx b/zy-acs-flow/src/page/userLogin/UserLoginList.jsx
index f0621ab..1ce3508 100644
--- a/zy-acs-flow/src/page/userLogin/UserLoginList.jsx
+++ b/zy-acs-flow/src/page/userLogin/UserLoginList.jsx
@@ -72,7 +72,7 @@
<TextInput source="token" label="table.field.userLogin.token" />,
<TextInput source="ip" label="table.field.userLogin.ip" />,
<NumberInput source="type" label="table.field.userLogin.type" />,
- <TextInput source="system" label="table.field.userLogin.system" />,
+ <TextInput source="systemName" label="table.field.userLogin.systemName" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
@@ -122,7 +122,7 @@
rowClick={(id, resource, record) => false}
expand={() => <UserLoginPanel />}
expandSingle={true}
- omit={['id', 'memo', 'type', 'system', 'updateTime']}
+ omit={['id', 'memo', 'type', 'systemName', 'updateTime']}
>
<NumberField source="id" />
<ReferenceField source="userId" label="table.field.userLogin.userId" reference="user" link={false}>
@@ -131,7 +131,7 @@
<TextField source="token" label="table.field.userLogin.token" />
<TextField source="ip" label="table.field.userLogin.ip" />
<NumberField source="type" label="table.field.userLogin.type" />
- <TextField source="system" label="table.field.userLogin.system" />
+ <TextField source="systemName" label="table.field.userLogin.systemName" />
<DateField source="createTime" label="common.field.createTime" showTime />
<TextField source="memo" label="common.field.memo" sortable={false} />
diff --git a/zy-acs-flow/src/page/userLogin/UserLoginPanel.jsx b/zy-acs-flow/src/page/userLogin/UserLoginPanel.jsx
index c686a63..0232686 100644
--- a/zy-acs-flow/src/page/userLogin/UserLoginPanel.jsx
+++ b/zy-acs-flow/src/page/userLogin/UserLoginPanel.jsx
@@ -66,8 +66,8 @@
</Grid>
<Grid item xs={6}>
<PanelTypography
- title="table.field.userLogin.system"
- property={record.system}
+ title="table.field.userLogin.systemName"
+ property={record.systemName}
/>
</Grid>
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
index 634781e..1b99173 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java
@@ -69,6 +69,7 @@
TRUNCATE man_task_log;
TRUNCATE man_travel_log;
TRUNCATE man_action_log;
+ TRUNCATE sys_user_login
# init
TRUNCATE man_code;
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