From 5e95f854a26c2b1b23af635a62684e6d810ea90a Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 30 Mar 2021 10:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sinosoft/activity/domain/DrawConfig.java     | 2 +-
 .../main/java/com/sinosoft/activity/domain/DrawInfo.java  | 2 +-
 .../src/main/resources/templates/activity/info/add.html   | 2 +-
 .../resources/templates/activity/info/configEdit.html     | 8 ++++----
 .../src/main/resources/templates/activity/info/edit.html  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
index 3bf55369c..5c72d2a69 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawConfig.java
@@ -60,7 +60,7 @@ public class DrawConfig extends BaseEntity
     private Long AVAILABLENUMBER;
 
     /** 状态 */
-    @Excel(name = "状态" ,readConverterExp="1=启用,2=禁用")
+    @Excel(name = "状态" ,readConverterExp="1=启用,2=停用")
     private String STATUS;
 
     /** 创建时间 */
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
index 8dab0e21a..6d6f019fc 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java
@@ -62,7 +62,7 @@ public class DrawInfo extends DrawRule
     private Date LASTUPDATETIMESTAMP;
 
     /** 状态 */
-    @Excel(name = "状态" ,readConverterExp="1=启用,2=禁用")
+    @Excel(name = "状态" ,readConverterExp="1=启用,2=停用")
     private String STATUS;
 
     /** 是否需要更新缓存 */
diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/info/add.html
index bb2402dd9..70a2c5a1e 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -110,7 +110,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
                         <div class="col-sm-8">
-                            <input name="DAILYNUMBER" placeholder="活动名称" class="form-control" type="text" maxlength="30">
+                            <input name="DAILYNUMBER" placeholder="时间段限制次数" class="form-control" type="text" maxlength="30">
                         </div>
                     </div>
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/info/configEdit.html b/sino-activity/src/main/resources/templates/activity/info/configEdit.html
index 17a454502..97a325833 100644
--- a/sino-activity/src/main/resources/templates/activity/info/configEdit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/configEdit.html
@@ -14,7 +14,7 @@
                     <label class="col-sm-4 control-label is-required">奖项名称：</label>
                     <div class="col-sm-8">
                         <select name="PRIZELEVEL" class="form-control" th:with="type=${@dict.getType('prizeLevel')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{PRIZELEVEL}"></option>
                         </select>
                     </div>
                 </div>
@@ -71,7 +71,7 @@
                     <label class="col-sm-4 control-label is-required">奖品发放制度：</label>
                     <div class="col-sm-8">
                         <select name="AWARDTYPE" class="form-control" th:with="type=${@dict.getType('AWARDTYPE')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{AWARDTYPE}"></option>
                         </select>
                     </div>
                 </div>
@@ -91,7 +91,7 @@
                     <label class="col-sm-4 control-label is-required">领取方式：</label>
                     <div class="col-sm-8">
                         <select name="AWARDMETHOD" class="form-control" th:with="type=${@dict.getType('AWARDMETHOD')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{AWARDMETHOD}"></option>
                         </select>
                     </div>
                 </div>
@@ -101,7 +101,7 @@
                     <label class="col-sm-4 control-label is-required">状态：</label>
                     <div class="col-sm-8">
                         <select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{STATUS}"></option>
                         </select>
                     </div>
                 </div>
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html
index 64f4dece1..904867b1c 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -112,7 +112,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
                             <div class="col-sm-8">
-                                <input name="DAILYNUMBER" th:field="*{DAILYNUMBER}" placeholder="活动名称" class="form-control" type="text" maxlength="30">
+                                <input name="DAILYNUMBER" th:field="*{DAILYNUMBER}" placeholder="时间段限制次数" class="form-control" type="text" maxlength="30">
                             </div>
                         </div>
                     </div>