From 1b555a0ab0527478cdf2b0c31c0ea8aea70f8adc Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 15 六月 2023 10:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into yxh01

---
 src/api/system/user.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-ui/src/api/system/user.js b/src/api/system/user.js
similarity index 96%
rename from ruoyi-ui/src/api/system/user.js
rename to src/api/system/user.js
index f2f76ef..d1f05a8 100644
--- a/ruoyi-ui/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi";
+import { parseStrEmpty } from "@/utils/ruoyi";//澶勭悊瀛楃涓�
 
 // 鏌ヨ鐢ㄦ埛鍒楄〃
 export function listUser(query) {

--
Gitblit v1.9.3