From 22cc779aff6d1ff2174e2cd4cfcb64ebe22f698f Mon Sep 17 00:00:00 2001 From: 叶松 <2217086471@qq.com> Date: 星期二, 28 十一月 2023 13:28:41 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java index 961909e..142f0e1 100644 --- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java +++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java @@ -21,7 +21,6 @@ private String id; private Integer type;//1、获取 2、消耗 - @Excel(sort = 4,title = "类型") private String typeName;//1、获取 2、消耗 private String integralSource;//积分怎么来的 @@ -29,20 +28,19 @@ private String companyId; private String userId; private Integer userType; - @Excel(sort = 3,title = "余额") private Double balanc;//当前余额 - - @Excel(sort = 2,title = "积分") - private Double integralWater;//当前可改积分流水 - private Double changeIntegral;//变量在积分超市 修改前的变量 + + @Excel(sort = 1,title = "时间") private Date createTime; + @Excel(sort = 2,title = "人员类别") + private String userTypeName; + @Excel(sort = 3,title = "人员姓名") + private String realName;//真实姓名 + @Excel(sort = 4,title = "积分") + private Double integralWater;//当前可改积分流水 @Excel(sort = 5,title = "说明") private String remark;//说明 - - @Excel(sort = 6,title = "人员姓名") - private String realName;//真实姓名 - } -- Gitblit v1.9.3