--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/model/order/OrderInfo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.Date;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -29,7 +30,7 @@ public class OrderInfo {
 	private Integer goodsid;
 	
 	@ApiModelProperty("商品类型")
-	private Integer type;
+	private String type;
 	
 	@ApiModelProperty("商品名称")
 	private String name;
@@ -52,6 +53,9 @@ public class OrderInfo {
 	@ApiModelProperty("售价")
 	private BigDecimal salePrice;
 
+	@ApiModelProperty("小计")
+	private BigDecimal totalPrice;
+	
 	@ApiModelProperty("数量")
 	private Integer num;
 	

com.zrqx.core/src/main/java/com/zrqx/core/model/order/OrderRemarkLog.java

+package com.zrqx.core.model.order;
+
+import java.math.BigInteger;
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "OrderRemarkLog",description = "订单备注记录表")
+@Data
+@Table(name = "ord_order_remark_log")
+public class OrderRemarkLog {
+	
+	@ApiModelProperty("id")
+	@GeneratedValue(generator = "JDBC")
+	@Id
+	private BigInteger id;
+	
+	@ApiModelProperty("订单id")
+	private Integer orderId;
+	
+	@ApiModelProperty("操作内容(功能描述,枚举配置)")
+	private String operationContent;
+	
+	@ApiModelProperty("操作前订单数据（JSON）")
+	private String beforeOperation;
+	
+	@ApiModelProperty("操作后订单数据（JSON）")
+	private String afterOperation;
+	
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+	
+	@ApiModelProperty("创建人id（操作人）")
+	private String creater;
+	
+	@ApiModelProperty("创建人名称（操作人）")
+	private String createrName;
+	
+	@ApiModelProperty("创建人类型（0用户 | 1管理员）")
+	private Integer createrType;
+	
+
+	
+	
+}

com.zrqx.core/src/main/java/com/zrqx/core/model/order/OrderStatusLog.java

+package com.zrqx.core.model.order;
+
+import java.math.BigInteger;
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "OrderStatusLog",description = "订单状态修改记录表")
+@Data
+@Table(name = "ord_order_status_log")
+public class OrderStatusLog {
+	
+	@ApiModelProperty("id")
+	@GeneratedValue(generator = "JDBC")
+	@Id
+	private BigInteger id;
+	
+	@ApiModelProperty("订单id")
+	private Integer orderId;
+	
+	@ApiModelProperty("操作内容(功能描述,枚举配置)")
+	private String operationContent;
+	
+	@ApiModelProperty("操作前订单数据（JSON）")
+	private String beforeOperation;
+	
+	@ApiModelProperty("操作后订单数据（JSON）")
+	private String afterOperation;
+	
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+	
+	@ApiModelProperty("创建人id（操作人）")
+	private String creater;
+	@ApiModelProperty("创建人名称（操作人）")
+	private String createrName;
+	
+	@ApiModelProperty("创建人类型（0用户 | 1管理员）")
+	private Integer createrType;
+	
+
+	
+	
+}