Merge remote-tracking branch 'origin/master'

xuhy

13 小时以前 206fcf7d6afae27856f63cf0158f53b61fa1b86f

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java

@@ -113,4 +113,13 @@
    @TableField("refund_status")
    private Integer refundStatus;

    @ApiModelProperty(value = "供应商id")
    @TableField("supplier_id")
    private String supplierId;


    @ApiModelProperty(value = "商户号")
    @TableField("merchant_no")
    private String merchantNo;

}