From a6ee712eb9df5bc09ca6e90a5b77ebe0d62cd818 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Wed, 31 Mar 2021 09:25:23 +0800
Subject: [PATCH 1/3] =?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=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/activity/info/info.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/info/info.html b/sino-activity/src/main/resources/templates/activity/info/info.html
index b33093807..9779375e9 100644
--- a/sino-activity/src/main/resources/templates/activity/info/info.html
+++ b/sino-activity/src/main/resources/templates/activity/info/info.html
@@ -11,7 +11,7 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <p>活动代码：</p>
+                            <p>活动编码：</p>
                             <input type="text" name="DRAWCODE"/>
                         </li>
                         <li>
@@ -146,7 +146,7 @@
                     visible: false
                 },
                 {
-                    field: 'VALIDATETYPE',
+                    field: 'validatetype',
                     title: '校验类型',
                     visible: false
                 },

From 91526430ad4c7fcd5d9d3f8246912cacb0a0dce2 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Wed, 31 Mar 2021 09:27:33 +0800
Subject: [PATCH 2/3] =?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=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sinosoft/activity/controller/DrawConfigController.java  | 2 +-
 .../java/com/sinosoft/activity/service/IDrawConfigService.java  | 2 +-
 .../java/com/sinosoft/activity/service/IDrawInfoService.java    | 2 +-
 .../sinosoft/activity/service/impl/DrawConfigServiceImpl.java   | 2 +-
 .../com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java
index 2c81d162e..5aaa33001 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawConfigController.java
@@ -28,7 +28,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
  * 存储奖项配置信息Controller
  *
- * @author ruoyi
+ * @author xlh
  * @date 2021-03-26
  */
 @Controller
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawConfigService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawConfigService.java
index 92ff87575..3cbb30dd7 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawConfigService.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawConfigService.java
@@ -7,7 +7,7 @@ import com.sinosoft.activity.domain.DrawConfig;
 /**
  * 存储奖项配置信息列表Service接口
  * 
- * @author ruoyi
+ * @author xlh
  * @date 2021-03-25
  */
 public interface IDrawConfigService 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
index 51e61d5c8..29ea2bf75 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * 抽奖活动管理对象Service接口
  * 
- * @author ruoyi
+ * @author xlh
  * @date 2021-03-25
  */
 public interface IDrawInfoService 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawConfigServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawConfigServiceImpl.java
index 68d27bb9c..14c732a30 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawConfigServiceImpl.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawConfigServiceImpl.java
@@ -13,7 +13,7 @@ import com.ruoyi.common.core.text.Convert;
 /**
  * 存储奖项配置信息列表Service业务层处理
  * 
- * @author ruoyi
+ * @author xlh
  * @date 2021-03-25
  */
 @Service
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
index b258db019..8a2c2a4a8 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
@@ -13,7 +13,7 @@ import com.ruoyi.common.core.text.Convert;
 /**
  * 抽奖活动管理对象Service业务层处理
  * 
- * @author ruoyi
+ * @author xlh
  * @date 2021-03-25
  */
 @Service

From b656222e6c5ed8e47147764ffa3dbe391c9be1a5 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Wed, 31 Mar 2021 09:40:01 +0800
Subject: [PATCH 3/3] =?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=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/activity/info/configAdd.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sino-activity/src/main/resources/templates/activity/info/configAdd.html b/sino-activity/src/main/resources/templates/activity/info/configAdd.html
index 44b55a24c..05a812304 100644
--- a/sino-activity/src/main/resources/templates/activity/info/configAdd.html
+++ b/sino-activity/src/main/resources/templates/activity/info/configAdd.html
@@ -68,7 +68,7 @@
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">奖品发放制度：</label>
+                    <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>