From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java b/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java
index dd123ff..73561e3 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java
@@ -27,6 +27,6 @@
/**
* 终端标识
*/
- private String webClientId;
+ private String loginQrCodeKey;
}
--
Gitblit v1.9.1