Merge branch 'develop' into dongjian

2025-10-17 14:41:35 +08:00
parent a366932b21 cb6a7710f3
commit a1884417d2
34 changed files with 390 additions and 277 deletions
@@ -259,6 +259,9 @@ export function assembleAddress(addressObj){
 	if(addressObj.areaId){
 		ids.push(addressObj.areaId)
 	}
+	if(addressObj.townshipId){
+		ids.push(addressObj.townshipId)
+	}
 	const names=[];
 	if(addressObj.countryName){
 		names.push(addressObj.countryName);
@@ -272,6 +275,9 @@ export function assembleAddress(addressObj){
 	if(addressObj.areaName){
 		names.push(addressObj.areaName);
 	}
+	if(addressObj.townshipName){
+		names.push(addressObj.townshipName);
+	}
 	resutlObj.ids=ids.join(",");
 	resutlObj.names=names.join(" ");
 	return resutlObj;