Merge remote-tracking branch 'origin/master'

zhs

9 天以前 76fb5d8b5249d74a77ca3e44ca9cf98b57b31ace

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

@@ -380,4 +380,16 @@
    @Excel(name = " 第二年龄单位 ")
    private String ageUnit2;

    /**
     * pageNum
     */
    @ApiModelProperty("pageNum")
    private Integer pageNum;

    /**
     * pageSize
     */
    @ApiModelProperty("pageSize")
    private Integer pageSize;

}