Merge remote-tracking branch 'origin/master'

xuhy

5 小时以前 3cc8093733d705ed5415e37eb82d909509590c4b

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

@@ -86,6 +86,11 @@
    @TableField("recv_merchant_no")
    private String recvMerchantNo;

    @ApiModelProperty(value = "接收方编号")
    @TableField("recv_no")
    private String recvNo;




}