Merge remote-tracking branch 'origin/master'

xuhy

19 小时以前 206fcf7d6afae27856f63cf0158f53b61fa1b86f

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

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

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


}