From 56eba9cded865648465bc2c5815d47441e0457b1 Mon Sep 17 00:00:00 2001
From: sxq <812980466@qq.com>
Date: 星期二, 22 六月 2021 15:35:52 +0800
Subject: [PATCH] Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.

---
 ruoyi-ui/src/utils/jsencrypt.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-ui/src/utils/jsencrypt.js b/ruoyi-ui/src/utils/jsencrypt.js
index f78e011..78d9523 100644
--- a/ruoyi-ui/src/utils/jsencrypt.js
+++ b/ruoyi-ui/src/utils/jsencrypt.js
@@ -1,4 +1,4 @@
-import JSEncrypt from 'jsencrypt/bin/jsencrypt'
+import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
 
 // 瀵嗛挜瀵圭敓鎴� http://web.chacuo.net/netrsakeypair
 

--
Gitblit v1.9.3