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; 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/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: '最后修改时间' 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..4dc169424 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 @@