Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 87c1e76403b09b137ad07abd75350a4b4cc23694

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

@@ -72,5 +72,12 @@
    @TableField("recv_merchant_no")
    private String recvMerchantNo;

    @ApiModelProperty(value = "终端号")
    @TableField("term_no")
    private String termNo;

    @ApiModelProperty(value = "仓库id")
    @TableField("warehouse_id")
    private String warehouseId;

}