From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderVO.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderVO.java b/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderVO.java
index fc724dc..b30bdee 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderVO.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/RegisterOrderVO.java
@@ -12,19 +12,18 @@
@Data
public class RegisterOrderVO {
/**
- *
- {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: '所在省市', field: 'provinceAndCity', visible: role==1?true:false, align: 'center', valign: 'middle'},
- {title: '所属门店', field: 'storeName', visible: role!=3?true:false, align: 'center', valign: 'middle'},
- {title: '购买用户', field: 'payUser', visible: true, align: 'center', valign: 'middle'},
- {title: '联系方式', field: 'phone', visible: true, align: 'center', valign: 'middle'},
- {title: '报名学员', field: 'payStudent', visible: true, align: 'center', valign: 'middle'},
- {title: '报名时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
- {title: '支付价格', field: 'payMoneyAndType', visible: true, align: 'center', valign: 'middle'},
- {title: '课包名称', field: 'coursePackage', visible: true, align: 'center', valign: 'middle'},
- {title: '订单来源', field: 'payUserType', visible: true, align: 'center', valign: 'middle',
- formatter:function (data) {return{1:"线上",2:"线下"}[data]}},
- {title: '销售人员', field: 'salesName', visible: true, align: 'center', valign: 'middle'}
+ * {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ * {title: '所在省市', field: 'provinceAndCity', visible: role==1?true:false, align: 'center', valign: 'middle'},
+ * {title: '所属门店', field: 'storeName', visible: role!=3?true:false, align: 'center', valign: 'middle'},
+ * {title: '购买用户', field: 'payUser', visible: true, align: 'center', valign: 'middle'},
+ * {title: '联系方式', field: 'phone', visible: true, align: 'center', valign: 'middle'},
+ * {title: '报名学员', field: 'payStudent', visible: true, align: 'center', valign: 'middle'},
+ * {title: '报名时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
+ * {title: '支付价格', field: 'payMoneyAndType', visible: true, align: 'center', valign: 'middle'},
+ * {title: '课包名称', field: 'coursePackage', visible: true, align: 'center', valign: 'middle'},
+ * {title: '订单来源', field: 'payUserType', visible: true, align: 'center', valign: 'middle',
+ * formatter:function (data) {return{1:"线上",2:"线下"}[data]}},
+ * {title: '销售人员', field: 'salesName', visible: true, align: 'center', valign: 'middle'}
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long id;
@@ -42,7 +41,7 @@
// 学员id
private Integer studentId;
private String payStudent;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
// 支付金额
private BigDecimal money;
--
Gitblit v1.7.1