Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827

# Conflicts:
#	config/index.js

pages/common/addScan/ScanEquip.vue

@@ -90,7 +90,7 @@
 			addCode() {
 				debugger;
 				if (!this.formData.inputCode) {
-					MsgWarning("请输入条码","确定", this);
+					MsgWarning("请输入二维码内容","确定", this);
 					return;
 				}
 
@@ -114,7 +114,7 @@
 						if (res && res.code == 200) {
 							console.log("res=", res);
 							let data = res.data;
-							this.serverDevice = data;
+						
 							if (data && data.id) {
 								resolve(data);
 								return;