Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

4 小时以前 34e64f1437ed897056bed0c3851e7a46ac220423

 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;


}