Merge remote-tracking branch 'origin/dev' into dev

src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -188,10 +188,10 @@
 		background: #f1f6ff;
 	}
 	.oder_xq_list dl span.user-address i:nth-of-type(1){
-		margin-left: 20px;
+		/*margin-left: 20px;*/
 	}
 	.oder_xq_list dl span.user-address i:nth-of-type(2){
-		margin-left: 70px;
+		/*margin-left: 70px;*/
 	}
 	.open-more{
 		text-align: center;