Merge branch 'xin' into pxb

彭雪彬

2025-07-15 d98e92ff3cd9bde1398d4f84a393da9397cb6e70

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

@@ -24,6 +24,9 @@
    private String blurry;

    @ApiModelProperty(value = "状态")
    private String merchantType;

    @ApiModelProperty(value = "状态")
    private String enabled;
    private List<Timestamp> createTime;
}