解决合并冲突,并实现种子junit单元测试

Change-Id: Ifff1a63aed76b380ea4767a1e6e1f31f3e9c0882
diff --git a/ruoyi-admin/src/main/resources/static/3856.bf5d9e18.async.js b/ruoyi-admin/src/main/resources/static/3856.bf5d9e18.async.js
new file mode 100644
index 0000000..ebbea2c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/3856.bf5d9e18.async.js
@@ -0,0 +1 @@
+"use strict";(self.webpackChunkant_design_pro=self.webpackChunkant_design_pro||[]).push([[3856],{23856:function(t,e,a){a.r(e),e.default={userCenterContainer:"FJYS355vP0T7gBjMoaY5",userCenterCard:"aT7UW6O1kqA3kMFUTltu",tabContent:"QMM8h2sHqQSMmmqwk4iB",tabHeader:"CfFhHRw3jaQdbXdAHTZb",emptyState:"TmbaNANEV_MdZMkB0cod",paymentModal:"mEhgVozc_WgSFZSS11wS",paymentInfo:"VS8XwoVc230hEGCYKYb9",qrCode:"KmOiZsuwje40awlcE_cP",qrCodePlaceholder:"TK17gIcKjPUkMGhLESak",mockQrCode:"AcX4oNiNNcllBHGJ_HBG",paymentActions:"gOTicNtZOeYVUV2zwwF8"}}}]);