Merge branch 'master-stander' into master-jiayan

fwq

10 小时以前 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java

@@ -53,6 +53,7 @@
    private Integer isTmk = 0;
    /**是否查询年龄:0否1是*/
    private Integer isYear = 0;

    /**是否查询优惠券信息,0否1是*/
    private Integer isSelectCoupon = 0;

}