Merge remote-tracking branch 'origin/master'

liusheng

4 天以前 6381bb6b6422c23ee4801895019f1a432903fbe8

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

@@ -75,7 +75,7 @@
    private String orgguid;

    @ApiModelProperty(value = "患者ID")
    private long patguid;
    private String patguid;

    @ApiModelProperty(value = "姓名")
    private String patname;