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

彭雪彬

2025-07-14 c1d20b425b10e8ba59f102dd1ab413055883eed0

 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;