diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java index 27e8cf155..6f826d0ca 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("userBasicInfoAddress") +@RequestMapping("api/userBasicInfoAddress") @Api(description = "会员地址相关接口") public class UserBasicInfoAddressController extends BaseController { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index bd51ea99d..b4dab67ff 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -742,6 +742,8 @@ public class WxUserGrantController extends BaseController { userVo.setName(wxCUserBasicInfo.getName()); userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); userVo.setSex(wxCUserBasicInfo.getSex()); + userVo.setHeight(wxCUserBasicInfo.getHeight()); + userVo.setWeight(wxCUserBasicInfo.getWeight()); userVo.setAddress(wxCUserBasicInfo.getAddress()); userVo.setStatus(wxCUserBasicInfo.getStatus()); userVo.setChildrenList(wxCUserBasicInfo.getChildrenList()); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java index 8418cfe78..900fd6574 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java @@ -32,6 +32,12 @@ public class WxCUserVo extends WxCUser { @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") private String name; + @io.swagger.annotations.ApiModelProperty(value="高",name="height") + private String height; + + @io.swagger.annotations.ApiModelProperty(value="重",name="weight") + private String weight; + @io.swagger.annotations.ApiModelProperty(value="折扣率",name="discountRate") private Integer discountRate;