Browse Source

收获地址展示层添加手机号和收货人姓名

LiTaohong 5 years ago
parent
commit
fbf74f64ac

+ 46 - 3
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPatientExpressageAddrVO.java

@ -1,9 +1,8 @@
package com.yihu.jw.restmodel.hospital.prescription;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import com.yihu.jw.restmodel.UuidIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@ -20,7 +19,7 @@ import java.util.Date;
 * @since 1.
 */
@ApiModel(value = "WlyyPatientExpressageAddrVO", description = "居民收获地址")
public class WlyyPatientExpressageAddrVO extends UuidIdentityVOWithOperator {
public class WlyyPatientExpressageAddrVO extends UuidIdentityVO {
    /**
	 * 居民标识
@ -100,12 +99,32 @@ public class WlyyPatientExpressageAddrVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "作废标识,1正常,0作废", example = "模块1")
    private String del;
    /**
     * 收货人手机号
     */
    @ApiModelProperty(value = "收货人手机号", example = "模块1")
    private String mobile;
    /**
     * 收货人姓名
     */
    @ApiModelProperty(value = "收货人姓名", example = "模块1")
    private String name;
    /**
     * 是否是默认地址,1是,0不是,一个用户只能有一个默认地址
     */
    @ApiModelProperty(value = "默认地址标识,1是,0不是", example = "模块1")
    private Integer isDefault;
    /**
     * 是否是默认地址,1是,0不是,一个用户只能有一个默认地址
     */
    @ApiModelProperty(value = "默认地址标识,1是,0不是", example = "模块1")
    private Date createTime;
    public String getPatient() {
        return patient;
@ -205,4 +224,28 @@ public class WlyyPatientExpressageAddrVO extends UuidIdentityVOWithOperator {
    public void setIsDefault(Integer isDefault) {
        this.isDefault = isDefault;
    }
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

+ 1 - 1
svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/expressage/WlyyPatientExpressageAddrEndpoint.java

@ -47,7 +47,7 @@ public class WlyyPatientExpressageAddrEndpoint extends EnvelopRestEndpoint {
        if(!StringUtils.isEmpty(log.toString())){
            return failed(log.toString());
        }
        return success(addrDO, WlyyPatientExpressageAddrVO.class);
        return success(addrDO);
    }
    @PostMapping(value = BaseHospitalRequestMapping.WlyyPatientExpressageAddr.DELETE)