Merge remote-tracking branch 'origin/mark' into su

2019-10-31 11:59:30 +08:00
parent 8ed5172f35 cf10522cfa
commit 5431abaddf
11 changed files with 141 additions and 89 deletions
--- a/business/model/dao/dao_user2.go
+++ b/business/model/dao/dao_user2.go
@@ -16,9 +16,9 @@ type StoreWithCityName struct {
 type UserDeliveryAddressEx struct {
 	model.UserDeliveryAddress

-	UserName     string
-	CityName     string
-	DistrictName string
+	UserName     string `json:"userName"`
+	CityName     string `json:"cityName"`
+	DistrictName string `json:"districtName"`
 }

 func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err error) {