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

彭雪彬

2025-07-14 c1d20b425b10e8ba59f102dd1ab413055883eed0

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