Merge remote-tracking branch 'origin/activity' into activity

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

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 

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 

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

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

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>

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
                 },