Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

 oying-system/src/main/java/com/oying/modules/system/domain/dto/UserMerchantQueryCriteria.java

@@ -21,7 +21,7 @@
    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(value = "角色类型（OWNER、ADMIN、FINANCE、OPERATOR）")
    @ApiModelProperty(value = "角色类型")
    private String roleType;
    private List<Timestamp> createTime;
}