Merge branch 'xin' into pxb

彭雪彬

2025-07-15 46f7c2ef3abc235e44c59be9b3c5396befc64888

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

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

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

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