Merge branch 'master' into master-任务组

陈昶聿

2 天以前 fcb98e4558897945a316d04555923355b8e60605

 smartor/src/main/java/com/smartor/domain/ServiceTaskScriptQues.java

@@ -46,10 +46,16 @@
    private String param4;

    /**
     * patfrom
     * 患者来源
     */
    @Excel(name = "patfrom  ")
    @ApiModelProperty(value = "patfrom")
    private String patfrom = "0";

    /**
     * 类型；0加密   1不加密
     */
    @ApiModelProperty(value = "类型；0加密   1不加密")
    private String type = "0";

}