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

无关风月

2024-06-24 0dfecde9ebe89ec797b273823c52e44baf056df6

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/TOrder.java

@@ -103,6 +103,10 @@
    @ApiModelProperty(value = "收货人地址")
    private String consigneeAddress;

    @ApiModelProperty(value = "订单备注")
    @TableField("remark")
    private String remark;


    public Integer getId() {
        return id;
@@ -195,17 +199,17 @@
    @Override
    public String toString() {
        return "TOrder{" +
        ", id=" + id +
        ", orderNumber=" + orderNumber +
        ", userId=" + userId +
        ", insertTime=" + insertTime +
        ", goodsId=" + goodsId +
        ", count=" + count +
        ", state=" + state +
        ", express=" + express +
        ", expressNumber=" + expressNumber +
        ", expressTime=" + expressTime +
        ", integral=" + integral +
        "}";
                ", id=" + id +
                ", orderNumber=" + orderNumber +
                ", userId=" + userId +
                ", insertTime=" + insertTime +
                ", goodsId=" + goodsId +
                ", count=" + count +
                ", state=" + state +
                ", express=" + express +
                ", expressNumber=" + expressNumber +
                ", expressTime=" + expressTime +
                ", integral=" + integral +
                "}";
    }
}