mirror of
				https://gitee.com/hhyykk/ipms-sjy-ui.git
				synced 2025-11-04 12:18:43 +08:00 
			
		
		
		
	Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts: .vscode/launch.json
This commit is contained in:
		@@ -63,7 +63,6 @@
 | 
				
			|||||||
    "steady-xml": "^0.1.0",
 | 
					    "steady-xml": "^0.1.0",
 | 
				
			||||||
    "url": "^0.11.0",
 | 
					    "url": "^0.11.0",
 | 
				
			||||||
    "video.js": "^8.0.4",
 | 
					    "video.js": "^8.0.4",
 | 
				
			||||||
    "vite-plugin-vue-setup-extend-plus": "^0.1.0",
 | 
					 | 
				
			||||||
    "vue": "3.2.47",
 | 
					    "vue": "3.2.47",
 | 
				
			||||||
    "vue-i18n": "9.2.2",
 | 
					    "vue-i18n": "9.2.2",
 | 
				
			||||||
    "vue-router": "^4.1.6",
 | 
					    "vue-router": "^4.1.6",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user