java/qijisheng.git

			@@ -2,7 +2,6 @@

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableLogic;
			import com.baomidou.mybatisplus.annotation.TableName;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -40,7 +39,7 @@
			@TableField("order_type")
			private Integer orderType;

			@ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中")
			@ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")
			@TableField("order_status")
			private Integer orderStatus;

			@@ -104,7 +103,6 @@
			@TableField("discount_total_amount")
			private BigDecimal discountTotalAmount;


			@ApiModelProperty(value = "实际支付价格")
			@TableField("payment_amount")
			private BigDecimal paymentAmount;
			@@ -113,7 +111,7 @@
			@TableField("point")
			private Integer point;

			@ApiModelProperty(value = "1wx2积分")
			@ApiModelProperty(value = "1微信，2账户余额，3积分")
			@TableField("pay_method")
			private Integer payMethod;

			@@ -128,6 +126,10 @@
			@ApiModelProperty(value = "运费")
			@TableField("express_amount")
			private BigDecimal expressAmount;

			@ApiModelProperty(value = "1微信，2账户余额")
			@TableField("express_pay_method")
			private Integer expressPayMethod;

			@ApiModelProperty(value = "第三方快递信息")
			@TableField("express_json")
			@@ -159,7 +161,6 @@

			@ApiModelProperty(value = "删除标志（0=否，1=是）")
			@TableField("del_flag")
			@TableLogic
			private Integer delFlag;

			@ApiModelProperty(value = "添加时间")