Merge branch 'dev' of trick9191/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionInfoDO.java

@@ -122,6 +122,16 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
     */
    private Double packRetprice;
    /**
     * 中草药数量
     */
    private String herbalCount;
    /**
     * 中草药贴数
     */
    private String postCount;
    @Column(name = "prescription_id")
    public String getPrescriptionId() {
@@ -300,4 +310,22 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
    public void setPackRetprice(Double packRetprice) {
        this.packRetprice = packRetprice;
    }
    @Column(name = "herbal_count")
    public String getHerbalCount() {
        return herbalCount;
    }
    public void setHerbalCount(String herbalCount) {
        this.herbalCount = herbalCount;
    }
    @Column(name = "post_count")
    public String getPostCount() {
        return postCount;
    }
    public void setPostCount(String postCount) {
        this.postCount = postCount;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionInfoVO.java

@@ -131,6 +131,12 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
     */
    @ApiModelProperty(value = "包装价格", example = "模块1")
    private Double packRetprice;
    @ApiModelProperty(value = "草药数量", example = "模块1")
    private String herbalCount;
    @ApiModelProperty(value = "贴数", example = "模块1")
    private String postCount;
    /**
     * 1可用 0删除
     */
@@ -294,4 +300,20 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
    public void setPackRetprice(Double packRetprice) {
        this.packRetprice = packRetprice;
    }
    public String getHerbalCount() {
        return herbalCount;
    }
    public void setHerbalCount(String herbalCount) {
        this.herbalCount = herbalCount;
    }
    public String getPostCount() {
        return postCount;
    }
    public void setPostCount(String postCount) {
        this.postCount = postCount;
    }
}