Merge branch 'pxb' into xin

xin

2025-07-19 7ece553fd95f30dcfafa66f667ef9d0c064a22e6

 oying-system/src/main/java/com/oying/modules/system/domain/Merchant.java

@@ -31,10 +31,13 @@
    private Long merchantId;

    @NotBlank
    @ApiModelProperty(value = "商户类型")
    private String merchantType;

    @NotBlank
    @ApiModelProperty(value = "名称")
    private String merchantName;

    @NotBlank
    @ApiModelProperty(value = "商户编码")
    private String merchantCode;