Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-14 b4d3224898d50b8f1e30b5c8083a520743927282

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

@@ -22,6 +22,9 @@
    @ApiModelProperty(value = "是否启用")
    private Boolean enabled;

    @ApiModelProperty(value = "用户类型")
    private List<String> userTypes;

    @ApiModelProperty(value = "创建时间")
    private List<Timestamp> createTime;