Merge branch 'dev' of yeshijie/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionExplain.java

@@ -16,7 +16,7 @@ public class PrescriptionExplain extends IdEntity {
    private String content;//续方说明
    private String del;//是否有效，1有效，0无效
    private Date createTiem;
    private Date createTime;
    public String getContent() {
        return content;
@@ -34,11 +34,11 @@ public class PrescriptionExplain extends IdEntity {
        this.del = del;
    }
    public Date getCreateTiem() {
        return createTiem;
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTiem(Date createTiem) {
        this.createTiem = createTiem;
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}