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/CoursePackagePaymentVO.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java
index 9bed267..55a9003 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackagePaymentVO.java
@@ -11,23 +11,22 @@
@Data
public class CoursePackagePaymentVO {
/**
- *
- {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: true, align: 'center', valign: 'middle'},
- {title: '课包类型', field: 'coursePackageType', visible: true, align: 'center', valign: 'middle'},
- {title: '课包名称', field: 'coursePackage', visible: true, 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: 'buyType', visible: true, align: 'center', valign: 'middle'},
- {title: '支付方式', field: 'payType', visible: true, align: 'center', valign: 'middle',
- formatter:function (data) {return{1:"微信",2:"支付宝",3:"玩湃币",4:"积分",5:"积分+微信",6:"积分+支付宝"}[data]}},
- {title: '总金额', field: 'originalPrice'+'元', visible: true, align: 'center', valign: 'middle'},
- {title: '优惠金额', field: 'discountAmount'+'元', visible: true, align: 'center', valign: 'middle'},
- {title: '支付价格', field: 'cashPayment'+'元', visible: true, align: 'center', valign: 'middle'},
- {title: '支付状态', field: 'payStatus', visible: true, align: 'center', valign: 'middle'},
- {title: '赠送课时', field: 'giftClassHours', 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: true, align: 'center', valign: 'middle'},
+ * {title: '课包类型', field: 'coursePackageType', visible: true, align: 'center', valign: 'middle'},
+ * {title: '课包名称', field: 'coursePackage', visible: true, 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: 'buyType', visible: true, align: 'center', valign: 'middle'},
+ * {title: '支付方式', field: 'payType', visible: true, align: 'center', valign: 'middle',
+ * formatter:function (data) {return{1:"微信",2:"支付宝",3:"玩湃币",4:"积分",5:"积分+微信",6:"积分+支付宝"}[data]}},
+ * {title: '总金额', field: 'originalPrice'+'元', visible: true, align: 'center', valign: 'middle'},
+ * {title: '优惠金额', field: 'discountAmount'+'元', visible: true, align: 'center', valign: 'middle'},
+ * {title: '支付价格', field: 'cashPayment'+'元', visible: true, align: 'center', valign: 'middle'},
+ * {title: '支付状态', field: 'payStatus', visible: true, align: 'center', valign: 'middle'},
+ * {title: '赠送课时', field: 'giftClassHours', visible: true, align: 'center', valign: 'middle'},
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long id;
--
Gitblit v1.7.1