Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 092a98a583c4fe822a3eb4c4dac086f84b16189c

 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;




}