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

common/common-entity/sql记录

@@ -467,4 +467,7 @@ CREATE TABLE `base_patient_contacts_org` (
-- 2021-05-07 skj
ALTER TABLE base.wlyy_patient_device add COLUMN  `sos_address` varchar(50) DEFAULT NULL COMMENT '设备类型为报警器时，需要填写投放地址 category_code = 7';
ALTER TABLE base.wlyy_patient_device add COLUMN  `sos_address` varchar(50) DEFAULT NULL COMMENT '设备类型为报警器时，需要填写投放地址 category_code = 7';
-- 2021-05-08 skj
ALTER TABLE base.base_life_care_item_dict add COLUMN  `life_care_img` varchar(255) DEFAULT NULL COMMENT '服务项目图片';

common/common-entity/src/main/java/com/yihu/jw/entity/care/lifeCare/LifeCareItemDictDO.java

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.care.lifeCare;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.math.BigDecimal;
@@ -19,6 +20,7 @@ public class LifeCareItemDictDO extends UuidIdentityEntity{
    private BigDecimal price;//价格
    private Integer sort;//排序字段
    private Integer del;//删除标志 1正常，0删除
    private String lifeCareImg;//服务项目图片
    public String getCode() {
        return code;
@@ -67,4 +69,13 @@ public class LifeCareItemDictDO extends UuidIdentityEntity{
    public void setDel(Integer del) {
        this.del = del;
    }
    @Column(name = "life_care_img")
    public String getLifeCareImg() {
        return lifeCareImg;
    }
    public void setLifeCareImg(String lifeCareImg) {
        this.lifeCareImg = lifeCareImg;
    }
}