Merge branch 'pxb' into xin

xin

2025-09-05 6f3c170403f34d452b5dc733043145d8d760fe41

 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;