Merge branch 'master' into xin

xin

2025-09-04 d70c240e09a9021824cc9e9f1bed8028a0c194cd

 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;
}