Merge branch 'pxb' into xin

xin

16 hours ago d3563f0bdb487124d79cdd20d0f8bfc79db31f24

 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;