From ca01676b7eaddbee766cf56aaf69341f06bbc269 Mon Sep 17 00:00:00 2001
From: cuibaocheng <java_cuibaocheng@163.com>
Date: Thu, 9 Sep 2021 11:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=90=84=E7=A7=8D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=20,=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BB=98=E6=AC=BE=E5=90=8E=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84BUG=20,=20=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E5=9C=B0=E5=8C=BA=E5=AD=98=E5=82=A8=20,=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=9A=E8=BF=87userId=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=90=8D=E7=89=87=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/configcolumn/save.html       | 4 ++--
 .../src/main/resources/templates/configcolumn/update.html     | 4 ++--
 .../src/main/resources/templates/configcolumngroup/save.html  | 4 ++--
 .../main/resources/templates/configcolumngroup/update.html    | 4 ++--
 .../pojo/dtos/configcolumngroup/ConfigColumnGroupDTO.java     | 2 +-
 .../pojo/vos/configcolumngroup/ConfigColumnGroupVO.java       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module-config-column/src/main/resources/templates/configcolumn/save.html b/module-config-column/src/main/resources/templates/configcolumn/save.html
index c3e417f..f5a6a72 100644
--- a/module-config-column/src/main/resources/templates/configcolumn/save.html
+++ b/module-config-column/src/main/resources/templates/configcolumn/save.html
@@ -241,8 +241,8 @@
                     <label class="layui-form-label">支持角色<span style="color: red">*</span></label>
                     <div class="layui-input-block layui-form">
                         <input type="checkbox" lay-verify="required" name="configColumnRole[0]" value="0"  title="默认显示">
-                        <input type="checkbox"  lay-verify="required" name="configColumnRole[1]" value="1"  title="个人普通版">
-                        <input type="checkbox"  lay-verify="required" name="configColumnRole[2]" value="2"  title="企业普通版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnRole[1]" value="1"  title="个人标准版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnRole[2]" value="2"  title="企业标准版">
                         <input type="checkbox" lay-verify="required" name="configColumnRole[3]" value="3"  title="企业高级版">
                     </div>
                 </div>
diff --git a/module-config-column/src/main/resources/templates/configcolumn/update.html b/module-config-column/src/main/resources/templates/configcolumn/update.html
index 46d4d99..c411bdb 100644
--- a/module-config-column/src/main/resources/templates/configcolumn/update.html
+++ b/module-config-column/src/main/resources/templates/configcolumn/update.html
@@ -242,8 +242,8 @@
                     <label class="layui-form-label">支持角色<span style="color: red">*</span></label>
                     <div class="layui-input-block layui-form">
                         <input type="checkbox" lay-verify="required" name="configColumnRole[0]" value="0"  title="默认显示">
-                        <input type="checkbox"  lay-verify="required" name="configColumnRole[1]" value="1"  title="个人普通版">
-                        <input type="checkbox"  lay-verify="required" name="configColumnRole[2]" value="2"  title="企业普通版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnRole[1]" value="1"  title="个人标准版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnRole[2]" value="2"  title="企业标准版">
                         <input type="checkbox" lay-verify="required" name="configColumnRole[3]" value="3"  title="企业高级版">
                     </div>
                 </div>
diff --git a/module-config-column/src/main/resources/templates/configcolumngroup/save.html b/module-config-column/src/main/resources/templates/configcolumngroup/save.html
index 960ede4..668dc75 100644
--- a/module-config-column/src/main/resources/templates/configcolumngroup/save.html
+++ b/module-config-column/src/main/resources/templates/configcolumngroup/save.html
@@ -131,8 +131,8 @@
                     <label class="layui-form-label">支持角色<span style="color: red">*</span></label>
                     <div class="layui-input-block layui-form">
                         <input type="checkbox" lay-verify="required" name="configColumnGroupRole[0]" value="0"  title="默认显示">
-                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[1]" value="1"  title="个人普通版">
-                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[2]" value="2"  title="企业普通版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[1]" value="1"  title="个人标准版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[2]" value="2"  title="企业标准版">
                         <input type="checkbox" lay-verify="required" name="configColumnGroupRole[3]" value="3"  title="企业高级版">
                     </div>
                 </div>
diff --git a/module-config-column/src/main/resources/templates/configcolumngroup/update.html b/module-config-column/src/main/resources/templates/configcolumngroup/update.html
index 6bdbe28..d896b32 100644
--- a/module-config-column/src/main/resources/templates/configcolumngroup/update.html
+++ b/module-config-column/src/main/resources/templates/configcolumngroup/update.html
@@ -131,8 +131,8 @@
                     <label class="layui-form-label">支持角色<span style="color: red">*</span></label>
                     <div class="layui-input-block layui-form">
                         <input type="checkbox" lay-verify="required" name="configColumnGroupRole[0]" value="0"  title="默认显示">
-                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[1]" value="1"  title="个人普通版">
-                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[2]" value="2"  title="企业普通版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[1]" value="1"  title="个人标准版">
+                        <input type="checkbox"  lay-verify="required" name="configColumnGroupRole[2]" value="2"  title="企业标准版">
                         <input type="checkbox" lay-verify="required" name="configColumnGroupRole[3]" value="3"  title="企业高级版">
                     </div>
                 </div>
diff --git a/pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/dtos/configcolumngroup/ConfigColumnGroupDTO.java b/pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/dtos/configcolumngroup/ConfigColumnGroupDTO.java
index e955d73..d3569d0 100644
--- a/pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/dtos/configcolumngroup/ConfigColumnGroupDTO.java
+++ b/pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/dtos/configcolumngroup/ConfigColumnGroupDTO.java
@@ -44,7 +44,7 @@ public class ConfigColumnGroupDTO {
     private Integer configColumnGroupOrder = 0;
     @ApiModelProperty(name = "configColumnGroupStyle", value = "引导页样式")
     private String configColumnGroupStyle;
-    @ApiModelProperty(name = "configColumnGroupRole", value = "适用角色0:默认,1:个人普通版,2:企业普通版,3:企业高级版")
+    @ApiModelProperty(name = "configColumnGroupRole", value = "适用角色0:默认,1:个人标准版,2:企业标准版,3:企业高级版")
     private String configColumnGroupRole;
     @ApiModelProperty(name = "creator", value = "")
     private String creator;
diff --git a/pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/vos/configcolumngroup/ConfigColumnGroupVO.java b/pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/vos/configcolumngroup/ConfigColumnGroupVO.java
index d185722..d23beba 100644
--- a/pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/vos/configcolumngroup/ConfigColumnGroupVO.java
+++ b/pojo-config-column/src/main/java/cn/com/tenlion/configcolumn/pojo/vos/configcolumngroup/ConfigColumnGroupVO.java
@@ -42,7 +42,7 @@ public class ConfigColumnGroupVO {
     private Integer configColumnGroupOrder = 0;
     @ApiModelProperty(name = "configColumnGroupStyle", value = "引导页样式")
     private String configColumnGroupStyle;
-    @ApiModelProperty(name = "configColumnGroupRole", value = "适用角色0:默认,1:个人普通版,2:企业普通版,3:企业高级版")
+    @ApiModelProperty(name = "configColumnGroupRole", value = "适用角色0:默认,1:个人标准版,2:企业标准版,3:企业高级版")
     private String configColumnGroupRole;
 
     public String getConfigColumnGroupRole() {