From 8376bbb21e3b3f79b1c8a55388273b9c3651b92a Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 15:20:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=AC=A1=E6=95=B0=E4=BD=BF=E7=94=A8=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/activity/consume/consume.html | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/consume/consume.html b/sino-activity/src/main/resources/templates/activity/consume/consume.html index 94f8ecffc..2701e512d 100644 --- a/sino-activity/src/main/resources/templates/activity/consume/consume.html +++ b/sino-activity/src/main/resources/templates/activity/consume/consume.html @@ -1,7 +1,7 @@ - +
@@ -47,14 +47,14 @@ -
  • - - -
    • + + + + + + + +
  •  搜索 @@ -155,13 +155,13 @@ title: '使用主键', visible: false }, - { - field: 'state', - title: '状态', - formatter: function (value, row, index) { - return $.table.selectDictLabel(STATEDatas, value); - } - }, + // { + // field: 'state', + // title: '状态', + // formatter: function (value, row, index) { + // return $.table.selectDictLabel(STATEDatas, value); + // } + // }, // { // field: 'lastupdatetimestamp', // title: '最后修改时间' From 0ef30cf346725364ff62d27396e7cdfaeaf53dfe Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 15:38:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=AC=A1=E6=95=B0=E4=BD=BF=E7=94=A8=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/activity/prizeInfo/info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html index 30505eaa9..73b3004b7 100644 --- a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html +++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html @@ -11,7 +11,7 @@
    • - +
    • From 3ba6718adbc30d2049e5ebb8431f68b7e1a6dab1 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 15:42:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=B7=BB=E5=8A=A0=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sinosoft/activity/domain/DrawRecord.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRecord.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRecord.java index 26092e6fe..58f74d9e8 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRecord.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawRecord.java @@ -33,7 +33,7 @@ public class DrawRecord extends BaseEntity private String USERID; /** 抽奖时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "抽奖时间", width = 30, dateFormat = "yyyy-MM-dd") private Date DRAWTIME; @@ -50,17 +50,17 @@ public class DrawRecord extends BaseEntity private String PRIZETYPE; /** 账务日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "账务日期", width = 30, dateFormat = "yyyy-MM-dd") private Date CHECKINGDATE; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") private Date CREATETIMESTAMP; /** 最后修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "最后修改时间", width = 30, dateFormat = "yyyy-MM-dd") private Date LASTUPDATETIMESTAMP; From 4ff427f9fb66a26cf377f1ede2c66a53f11a7c26 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 15:45:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/activity/record/record.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sino-activity/src/main/resources/templates/activity/record/record.html b/sino-activity/src/main/resources/templates/activity/record/record.html index dacb7d2d0..551f8c972 100644 --- a/sino-activity/src/main/resources/templates/activity/record/record.html +++ b/sino-activity/src/main/resources/templates/activity/record/record.html @@ -32,7 +32,7 @@
    • - From 184363a90b4f0ebe937f05344874173b620077fb Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 31 Mar 2021 15:57:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/activity/awardRecord/record.html | 4 ++-- .../src/main/resources/templates/activity/prizeInfo/info.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html index 4c3bdbe5a..cea9f6192 100644 --- a/sino-activity/src/main/resources/templates/activity/awardRecord/record.html +++ b/sino-activity/src/main/resources/templates/activity/awardRecord/record.html @@ -40,7 +40,7 @@
    • - @@ -80,7 +80,7 @@
    • - diff --git a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html index 73b3004b7..4dc169424 100644 --- a/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html +++ b/sino-activity/src/main/resources/templates/activity/prizeInfo/info.html @@ -24,7 +24,7 @@
    • -