Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev

jz-dm-manage/src/main/java/com/jz/manage/moduls/controller/order/bean/OrderDetailDto.java

+package com.jz.manage.moduls.controller.order.bean;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 订单表(TOrder)实体类
+ *
+ * @author makejava
+ * @since 2020-12-01 10:41:40
+ */
+
+@ApiModel(value = "订单管理--订单列表返回参数对象", description = "订单列表返回参数对象")
+public class OrderDetailDto {
+    private static final long serialVersionUID = 651546246975691600L;
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty(value = "订单编号")
+    private String orderNumber;
+    /**
+     * 订单状态：01待支付，02已支付，03已取消
+     */
+    @ApiModelProperty(value = "订单状态：01待支付，02已支付，03已取消")
+    private String orderStatus;
+    /**
+     * 订单金额
+     */
+    @ApiModelProperty(value = "订单金额")
+    private BigDecimal orderMoney;
+    /**
+     * 订单时间
+     */
+    @ApiModelProperty(value = "订单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date orderTime;
+    /**
+     * 支付方式：01余额
+     */
+    @ApiModelProperty(value = "支付方式：01余额")
+    private String paymentMethod;
+    /**
+     * 购买方式：01年，02季，03月，04次(服务类型)
+     */
+    @ApiModelProperty(value = "购买方式：01年，02季，03月，04次(服务类型)")
+    private String purchaseMethod;
+
+    /**
+     * 数据名称
+     */
+    @ApiModelProperty(value = "数据名称")
+    private String dataName;
+    /**
+     * 数据分类
+     */
+    @ApiModelProperty(value = "数据分类")
+    private String dataType;
+
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty(value = "企业名称")
+    private String departmentName;
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public BigDecimal getOrderMoney() {
+        return orderMoney;
+    }
+
+    public void setOrderMoney(BigDecimal orderMoney) {
+        this.orderMoney = orderMoney;
+    }
+
+    public Date getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(Date orderTime) {
+        this.orderTime = orderTime;
+    }
+
+    public String getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(String paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
+    public String getPurchaseMethod() {
+        return purchaseMethod;
+    }
+
+    public void setPurchaseMethod(String purchaseMethod) {
+        this.purchaseMethod = purchaseMethod;
+    }
+
+    public String getDataName() {
+        return dataName;
+    }
+
+    public void setDataName(String dataName) {
+        this.dataName = dataName;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+}
\ No newline at end of file