Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 092a98a583c4fe822a3eb4c4dac086f84b16189c

 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;

}