Merge branch 'master' into 1027-master

liusheng

8 天以前 0f22f66ae9d2156b983f533beb17a0062a949524

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

@@ -416,4 +416,10 @@
    @ApiModelProperty("ps")
    private Integer ps;

    @ApiModelProperty(value = "最后开始时间")
    private String lastStartTime;

    @ApiModelProperty(value = "最后结束时间")
    private String lastEndTime;

}