Просмотр исходного кода

Merge branch 'release_real_20211001' of https://git.malls.iformall.com/server/formallProject into release_real_20211001

release_toaliyun_real
xiaohanzi 4 лет назад
Родитель
Сommit
4645460a36
3 измененных файлов: 9 добавлений и 1 удалений
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java
  2. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  3. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java

+ 1
- 1
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 {



+ 2
- 0
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());


+ 6
- 0
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;



Загрузка…
Отмена
Сохранить