huangxiao 2 viikkoa sitten
vanhempi
commit
29534cb1c9
29 muutettua tiedostoa jossa 100 lisäystä ja 50 poistoa
  1. 1 1
      src/main/java/net/mingsoft/tf/action/BaseAction.java
  2. 12 12
      src/main/java/net/mingsoft/tf/action/BoothAction.java
  3. 1 1
      src/main/java/net/mingsoft/tf/action/ExhibitionAction.java
  4. 10 1
      src/main/java/net/mingsoft/tf/action/ExhibitorAction.java
  5. 1 1
      src/main/java/net/mingsoft/tf/biz/IBoothBiz.java
  6. 1 1
      src/main/java/net/mingsoft/tf/biz/IExhibitionBiz.java
  7. 1 1
      src/main/java/net/mingsoft/tf/biz/IExhibitorBiz.java
  8. 1 1
      src/main/java/net/mingsoft/tf/biz/impl/BoothBizImpl.java
  9. 1 1
      src/main/java/net/mingsoft/tf/biz/impl/ExhibitionBizImpl.java
  10. 1 1
      src/main/java/net/mingsoft/tf/biz/impl/ExhibitorBizImpl.java
  11. 1 1
      src/main/java/net/mingsoft/tf/constant/Const.java
  12. 1 1
      src/main/java/net/mingsoft/tf/dao/IBoothDao.java
  13. 1 1
      src/main/java/net/mingsoft/tf/dao/IBoothDao.xml
  14. 1 1
      src/main/java/net/mingsoft/tf/dao/IExhibitionDao.java
  15. 1 1
      src/main/java/net/mingsoft/tf/dao/IExhibitorDao.java
  16. 1 0
      src/main/java/net/mingsoft/tf/dao/IExhibitorDao.xml
  17. 7 7
      src/main/java/net/mingsoft/tf/entity/BoothEntity.java
  18. 2 2
      src/main/java/net/mingsoft/tf/entity/ExhibitionEntity.java
  19. 20 2
      src/main/java/net/mingsoft/tf/entity/ExhibitorEntity.java
  20. 2 1
      src/main/java/net/mingsoft/tf/resources/resources_en_US.properties
  21. 2 1
      src/main/java/net/mingsoft/tf/resources/resources_zh_CN.properties
  22. 4 4
      src/main/webapp/WEB-INF/manager/tf/booth/form.ftl
  23. 4 4
      src/main/webapp/WEB-INF/manager/tf/booth/index.ftl
  24. 7 1
      src/main/webapp/WEB-INF/manager/tf/exhibitor/form.ftl
  25. 4 0
      src/main/webapp/WEB-INF/manager/tf/exhibitor/index.ftl
  26. 1 1
      src/main/webapp/static/locale/lang/booth/en_US.js
  27. 1 1
      src/main/webapp/static/locale/lang/booth/zh_CN.js
  28. 5 0
      src/main/webapp/static/locale/lang/exhibitor/en_US.js
  29. 5 0
      src/main/webapp/static/locale/lang/exhibitor/zh_CN.js

+ 1 - 1
src/main/java/net/mingsoft/tf/action/BaseAction.java

@@ -7,7 +7,7 @@ import net.mingsoft.base.util.BundleUtil;
 /**
 * tf基础控制层
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:02<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 public class BaseAction extends net.mingsoft.basic.action.BaseAction{

+ 12 - 12
src/main/java/net/mingsoft/tf/action/BoothAction.java

@@ -48,7 +48,7 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn;
 /**
 * 展位管理控制层
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:01<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 @Tag(name = "后台-展位接口")
@@ -90,7 +90,7 @@ public class BoothAction extends net.mingsoft.tf.action.BaseAction{
     @Operation(summary = "查询展位列表接口")
     @Parameters({
         @Parameter(name = "boothCode", description = "编码", in = ParameterIn.QUERY),
-        @Parameter(name = "inputHudra", description = "楼层", in = ParameterIn.QUERY),
+        @Parameter(name = "boothFloor", description = "楼层", in = ParameterIn.QUERY),
         @Parameter(name = "boothName", description = "名称", in = ParameterIn.QUERY),
         @Parameter(name = "boothStyle", description = "风格", in = ParameterIn.QUERY),
         @Parameter(name = "boothMaterials", description = "材料", in = ParameterIn.QUERY),
@@ -137,7 +137,7 @@ public class BoothAction extends net.mingsoft.tf.action.BaseAction{
     @Operation(summary = "保存展位列表接口")
     @Parameters({
         @Parameter(name = "boothCode", description = "编码", required = true, in = ParameterIn.QUERY),
-        @Parameter(name = "inputHudra", description = "楼层", required = true, in = ParameterIn.QUERY),
+        @Parameter(name = "boothFloor", description = "楼层", required = true, in = ParameterIn.QUERY),
         @Parameter(name = "boothName", description = "名称", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "boothStyle", description = "风格", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "boothMaterials", description = "材料", required = false, in = ParameterIn.QUERY),
@@ -161,11 +161,11 @@ public class BoothAction extends net.mingsoft.tf.action.BaseAction{
           return ResultData.build().error(getResString("err.length", this.getResString("booth.code"), "0", "255"));
         }
         //验证楼层的值是否合法
-        if (StringUtils.isBlank(booth.getInputHudra())) {
-            return ResultData.build().error(getResString("err.empty", this.getResString("input.hudra")));
+        if (StringUtils.isBlank(booth.getBoothFloor())) {
+            return ResultData.build().error(getResString("err.empty", this.getResString("booth.floor")));
         }
-        if (!StringUtil.checkLength(booth.getInputHudra()+"", 0, 255)) {
-          return ResultData.build().error(getResString("err.length", this.getResString("input.hudra"), "0", "255"));
+        if (!StringUtil.checkLength(booth.getBoothFloor()+"", 0, 255)) {
+          return ResultData.build().error(getResString("err.length", this.getResString("booth.floor"), "0", "255"));
         }
         if (  StringUtils.isNotBlank(booth.getBoothName()) && !StringUtil.checkLength(booth.getBoothName()+"", 0, 255)) {
           return ResultData.build().error(getResString("err.length", this.getResString("booth.name"), "0", "255"));
@@ -208,7 +208,7 @@ public class BoothAction extends net.mingsoft.tf.action.BaseAction{
     @Parameters({
         @Parameter(name = "id", description = "主键ID", required =true,in = ParameterIn.QUERY),
         @Parameter(name = "boothCode", description = "编码", required = true, in = ParameterIn.QUERY),
-        @Parameter(name = "inputHudra", description = "楼层", required = true, in = ParameterIn.QUERY),
+        @Parameter(name = "boothFloor", description = "楼层", required = true, in = ParameterIn.QUERY),
         @Parameter(name = "boothName", description = "名称", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "boothStyle", description = "风格", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "boothMaterials", description = "材料", required = false, in = ParameterIn.QUERY),
@@ -237,11 +237,11 @@ public class BoothAction extends net.mingsoft.tf.action.BaseAction{
           return ResultData.build().error(getResString("err.length", this.getResString("booth.code"), "0", "255"));
         }
         //验证楼层的值是否合法
-        if (StringUtils.isBlank(booth.getInputHudra())) {
-            return ResultData.build().error(getResString("err.empty", this.getResString("input.hudra")));
+        if (StringUtils.isBlank(booth.getBoothFloor())) {
+            return ResultData.build().error(getResString("err.empty", this.getResString("booth.floor")));
         }
-        if (!StringUtil.checkLength(booth.getInputHudra()+"", 0, 255)) {
-          return ResultData.build().error(getResString("err.length", this.getResString("input.hudra"), "0", "255"));
+        if (!StringUtil.checkLength(booth.getBoothFloor()+"", 0, 255)) {
+          return ResultData.build().error(getResString("err.length", this.getResString("booth.floor"), "0", "255"));
         }
         if (  StringUtils.isNotBlank(booth.getBoothName()) && !StringUtil.checkLength(booth.getBoothName()+"", 0, 255)) {
           return ResultData.build().error(getResString("err.length", this.getResString("booth.name"), "0", "255"));

+ 1 - 1
src/main/java/net/mingsoft/tf/action/ExhibitionAction.java

@@ -48,7 +48,7 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn;
 /**
 * 展会管理控制层
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:02<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 @Tag(name = "后台-展会接口")

+ 10 - 1
src/main/java/net/mingsoft/tf/action/ExhibitorAction.java

@@ -48,7 +48,7 @@ import io.swagger.v3.oas.annotations.enums.ParameterIn;
 /**
 * 展商管理控制层
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:02<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 @Tag(name = "后台-展商接口")
@@ -96,6 +96,7 @@ public class ExhibitorAction extends net.mingsoft.tf.action.BaseAction{
         @Parameter(name = "exhibitorIntroduction", description = "公司简介", in = ParameterIn.QUERY),
         @Parameter(name = "exhibitorUser", description = "用户ID", in = ParameterIn.QUERY),
         @Parameter(name = "exhibitorActivities", description = "展会ID", in = ParameterIn.QUERY),
+        @Parameter(name = "exhibitorCode", description = "邀请码", in = ParameterIn.QUERY),
     })
     @RequestMapping(value ="/list",method = {RequestMethod.GET,RequestMethod.POST})
     @ResponseBody
@@ -145,6 +146,7 @@ public class ExhibitorAction extends net.mingsoft.tf.action.BaseAction{
         @Parameter(name = "exhibitorIntroduction", description = "公司简介", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "exhibitorUser", description = "用户ID", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "exhibitorActivities", description = "展会ID", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "exhibitorCode", description = "邀请码", required = false, in = ParameterIn.QUERY),
     })
     @PostMapping("/save")
     @ResponseBody
@@ -178,6 +180,9 @@ public class ExhibitorAction extends net.mingsoft.tf.action.BaseAction{
         if (  StringUtils.isNotBlank(exhibitor.getExhibitorActivities()) && !StringUtil.checkLength(exhibitor.getExhibitorActivities()+"", 0, 255)) {
           return ResultData.build().error(getResString("err.length", this.getResString("exhibitor.activities"), "0", "255"));
         }
+        if (  StringUtils.isNotBlank(exhibitor.getExhibitorCode()) && !StringUtil.checkLength(exhibitor.getExhibitorCode()+"", 0, 255)) {
+          return ResultData.build().error(getResString("err.length", this.getResString("exhibitor.code"), "0", "255"));
+        }
         exhibitorBiz.save(exhibitor);
         return ResultData.build().success(exhibitor);
     }
@@ -213,6 +218,7 @@ public class ExhibitorAction extends net.mingsoft.tf.action.BaseAction{
         @Parameter(name = "exhibitorIntroduction", description = "公司简介", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "exhibitorUser", description = "用户ID", required = false, in = ParameterIn.QUERY),
         @Parameter(name = "exhibitorActivities", description = "展会ID", required = false, in = ParameterIn.QUERY),
+        @Parameter(name = "exhibitorCode", description = "邀请码", required = false, in = ParameterIn.QUERY),
     })
     @PostMapping("/update")
     @ResponseBody
@@ -251,6 +257,9 @@ public class ExhibitorAction extends net.mingsoft.tf.action.BaseAction{
         if (  StringUtils.isNotBlank(exhibitor.getExhibitorActivities()) && !StringUtil.checkLength(exhibitor.getExhibitorActivities()+"", 0, 255)) {
           return ResultData.build().error(getResString("err.length", this.getResString("exhibitor.activities"), "0", "255"));
         }
+        if (  StringUtils.isNotBlank(exhibitor.getExhibitorCode()) && !StringUtil.checkLength(exhibitor.getExhibitorCode()+"", 0, 255)) {
+          return ResultData.build().error(getResString("err.length", this.getResString("exhibitor.code"), "0", "255"));
+        }
         exhibitorBiz.updateById(exhibitor);
         return ResultData.build().success(exhibitor);
     }

+ 1 - 1
src/main/java/net/mingsoft/tf/biz/IBoothBiz.java

@@ -7,7 +7,7 @@ import net.mingsoft.tf.entity.BoothEntity;
 /**
  * 展位业务
  * @author 阿白
- * 创建日期:2025年10月23日 下午6:08:01<br/>
+ * 创建日期:2025年10月23日 下午6:41:34<br/>
  * 历史修订:<br/>
  */
 public interface IBoothBiz extends IBaseBiz<BoothEntity> {

+ 1 - 1
src/main/java/net/mingsoft/tf/biz/IExhibitionBiz.java

@@ -7,7 +7,7 @@ import net.mingsoft.tf.entity.ExhibitionEntity;
 /**
  * 展会业务
  * @author 阿白
- * 创建日期:2025年10月23日 下午6:08:02<br/>
+ * 创建日期:2025年10月23日 下午6:41:34<br/>
  * 历史修订:<br/>
  */
 public interface IExhibitionBiz extends IBaseBiz<ExhibitionEntity> {

+ 1 - 1
src/main/java/net/mingsoft/tf/biz/IExhibitorBiz.java

@@ -7,7 +7,7 @@ import net.mingsoft.tf.entity.ExhibitorEntity;
 /**
  * 展商业务
  * @author 阿白
- * 创建日期:2025年10月23日 下午6:08:02<br/>
+ * 创建日期:2025年10月23日 下午6:41:34<br/>
  * 历史修订:<br/>
  */
 public interface IExhibitorBiz extends IBaseBiz<ExhibitorEntity> {

+ 1 - 1
src/main/java/net/mingsoft/tf/biz/impl/BoothBizImpl.java

@@ -12,7 +12,7 @@ import net.mingsoft.tf.dao.IBoothDao;
 /**
 * 展位管理持久化层
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:01<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 @Service("tfboothBizImpl")

+ 1 - 1
src/main/java/net/mingsoft/tf/biz/impl/ExhibitionBizImpl.java

@@ -12,7 +12,7 @@ import net.mingsoft.tf.dao.IExhibitionDao;
 /**
 * 展会管理持久化层
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:02<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 @Service("tfexhibitionBizImpl")

+ 1 - 1
src/main/java/net/mingsoft/tf/biz/impl/ExhibitorBizImpl.java

@@ -12,7 +12,7 @@ import net.mingsoft.tf.dao.IExhibitorDao;
 /**
 * 展商管理持久化层
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:02<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 @Service("tfexhibitorBizImpl")

+ 1 - 1
src/main/java/net/mingsoft/tf/constant/Const.java

@@ -5,7 +5,7 @@ import java.util.ResourceBundle;
 /**
  * tf定义
  * @author 阿白
- * 创建日期:2025年10月23日 下午6:08:02<br/>
+ * 创建日期:2025年10月23日 下午6:41:34<br/>
  * 历史修订:<br/>
  */
 public final class Const {

+ 1 - 1
src/main/java/net/mingsoft/tf/dao/IBoothDao.java

@@ -7,7 +7,7 @@ import net.mingsoft.tf.entity.BoothEntity;
 /**
  * 展位持久层
  * @author 阿白
- * 创建日期:2025年10月23日 下午6:08:01<br/>
+ * 创建日期:2025年10月23日 下午6:41:34<br/>
  * 历史修订:<br/>
  */
 public interface IBoothDao extends IBaseDao<BoothEntity> {

+ 1 - 1
src/main/java/net/mingsoft/tf/dao/IBoothDao.xml

@@ -4,7 +4,7 @@
 
 	<resultMap id="resultMap" type="net.mingsoft.tf.entity.BoothEntity">
 				<result column="BOOTH_CODE" property="boothCode" /><!--编码 -->
-				<result column="INPUT_HUDRA" property="inputHudra" /><!--楼层 -->
+				<result column="BOOTH_FLOOR" property="boothFloor" /><!--楼层 -->
 				<result column="BOOTH_NAME" property="boothName" /><!--名称 -->
 				<result column="BOOTH_STYLE" property="boothStyle" /><!--风格 -->
 				<result column="BOOTH_MATERIALS" property="boothMaterials" /><!--材料 -->

+ 1 - 1
src/main/java/net/mingsoft/tf/dao/IExhibitionDao.java

@@ -7,7 +7,7 @@ import net.mingsoft.tf.entity.ExhibitionEntity;
 /**
  * 展会持久层
  * @author 阿白
- * 创建日期:2025年10月23日 下午6:08:02<br/>
+ * 创建日期:2025年10月23日 下午6:41:34<br/>
  * 历史修订:<br/>
  */
 public interface IExhibitionDao extends IBaseDao<ExhibitionEntity> {

+ 1 - 1
src/main/java/net/mingsoft/tf/dao/IExhibitorDao.java

@@ -7,7 +7,7 @@ import net.mingsoft.tf.entity.ExhibitorEntity;
 /**
  * 展商持久层
  * @author 阿白
- * 创建日期:2025年10月23日 下午6:08:02<br/>
+ * 创建日期:2025年10月23日 下午6:41:34<br/>
  * 历史修订:<br/>
  */
 public interface IExhibitorDao extends IBaseDao<ExhibitorEntity> {

+ 1 - 0
src/main/java/net/mingsoft/tf/dao/IExhibitorDao.xml

@@ -11,6 +11,7 @@
 				<result column="EXHIBITOR_INTRODUCTION" property="exhibitorIntroduction" /><!--公司简介 -->
 				<result column="EXHIBITOR_USER" property="exhibitorUser" /><!--用户ID -->
 				<result column="EXHIBITOR_ACTIVITIES" property="exhibitorActivities" /><!--展会ID -->
+				<result column="EXHIBITOR_CODE" property="exhibitorCode" /><!--邀请码 -->
 	</resultMap>
 
 	<select id="query" resultMap="resultMap">

+ 7 - 7
src/main/java/net/mingsoft/tf/entity/BoothEntity.java

@@ -17,13 +17,13 @@ import java.util.Date;
 /**
 * 展位实体
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:01<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 @TableName("BOOTH")
 public class BoothEntity extends BaseEntity {
 
-private static final long serialVersionUID = 1761214081936L;
+private static final long serialVersionUID = 1761216094319L;
 
     /**
     * 编码
@@ -34,7 +34,7 @@ private static final long serialVersionUID = 1761214081936L;
     * 楼层
     */
     @TableField(condition = SqlCondition.LIKE)
-    private String inputHudra;
+    private String boothFloor;
     /**
     * 名称
     */
@@ -73,15 +73,15 @@ private static final long serialVersionUID = 1761214081936L;
     /**
     * 设置楼层
     */
-    public void setInputHudra(String inputHudra) {
-        this.inputHudra = inputHudra;
+    public void setBoothFloor(String boothFloor) {
+        this.boothFloor = boothFloor;
     }
 
     /**
     * 获取楼层
     */
-    public String getInputHudra() {
-        return this.inputHudra;
+    public String getBoothFloor() {
+        return this.boothFloor;
     }
     /**
     * 设置名称

+ 2 - 2
src/main/java/net/mingsoft/tf/entity/ExhibitionEntity.java

@@ -17,13 +17,13 @@ import java.util.Date;
 /**
 * 展会实体
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:02<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 @TableName("EXHIBITION")
 public class ExhibitionEntity extends BaseEntity {
 
-private static final long serialVersionUID = 1761214082179L;
+private static final long serialVersionUID = 1761216094564L;
 
     /**
     * 活动名称

+ 20 - 2
src/main/java/net/mingsoft/tf/entity/ExhibitorEntity.java

@@ -17,13 +17,13 @@ import java.util.Date;
 /**
 * 展商实体
 * @author 阿白
-* 创建日期:2025年10月23日 下午6:08:02<br/>
+* 创建日期:2025年10月23日 下午6:41:34<br/>
 * 历史修订:<br/>
 */
 @TableName("EXHIBITOR")
 public class ExhibitorEntity extends BaseEntity {
 
-private static final long serialVersionUID = 1761214082422L;
+private static final long serialVersionUID = 1761216094822L;
 
     /**
     * 公司名称
@@ -65,6 +65,11 @@ private static final long serialVersionUID = 1761214082422L;
     */
     @TableField(condition = SqlCondition.LIKE)
     private String exhibitorActivities;
+    /**
+    * 邀请码
+    */
+    @TableField(condition = SqlCondition.LIKE)
+    private String exhibitorCode;
 
 
     /**
@@ -171,6 +176,19 @@ private static final long serialVersionUID = 1761214082422L;
     public String getExhibitorActivities() {
         return this.exhibitorActivities;
     }
+    /**
+    * 设置邀请码
+    */
+    public void setExhibitorCode(String exhibitorCode) {
+        this.exhibitorCode = exhibitorCode;
+    }
+
+    /**
+    * 获取邀请码
+    */
+    public String getExhibitorCode() {
+        return this.exhibitorCode;
+    }
 
 
 }

+ 2 - 1
src/main/java/net/mingsoft/tf/resources/resources_en_US.properties

@@ -1,5 +1,5 @@
 booth.code=booth code
-input.hudra=input hudra
+booth.floor=booth floor
 booth.name=booth name
 booth.style=booth style
 booth.materials=booth materials
@@ -15,3 +15,4 @@ exhibitor.logo=exhibitor logo
 exhibitor.introduction=exhibitor introduction
 exhibitor.user=exhibitor user
 exhibitor.activities=exhibitor activities
+exhibitor.code=exhibitor code

+ 2 - 1
src/main/java/net/mingsoft/tf/resources/resources_zh_CN.properties

@@ -1,5 +1,5 @@
 booth.code=\u7f16\u7801
-input.hudra=\u697c\u5c42
+booth.floor=\u697c\u5c42
 booth.name=\u540d\u79f0
 booth.style=\u98ce\u683c
 booth.materials=\u6750\u6599
@@ -15,3 +15,4 @@ exhibitor.logo=\u516c\u53f8LOGO
 exhibitor.introduction=\u516c\u53f8\u7b80\u4ecb
 exhibitor.user=\u7528\u6237ID
 exhibitor.activities=\u5c55\u4f1aID
+exhibitor.code=\u9080\u8bf7\u7801

+ 4 - 4
src/main/webapp/WEB-INF/manager/tf/booth/form.ftl

@@ -30,9 +30,9 @@
 	        </el-form-item>   
             <!--楼层-->
 
-	        <el-form-item  label="楼层" prop="inputHudra">
+	        <el-form-item  label="楼层" prop="boothFloor">
 	            <el-input
-                        v-model="form.inputHudra"
+                        v-model="form.boothFloor"
                          :disabled="false"
                           :readonly="false"
                           :style="{width:  '100%'}"
@@ -104,7 +104,7 @@
                     // 编码
                     boothCode:'',
                     // 楼层
-                    inputHudra:'',
+                    boothFloor:'',
                     // 名称
                     boothName:'',
                     // 风格
@@ -119,7 +119,7 @@
                         // 编码
                         boothCode: [{"type":"string","message":"编码格式不正确"},{"required":true,"message":"编码不能为空"},{"min":0,"max":255,"message":"编码长度必须为0-255"}],
                         // 楼层
-                        inputHudra: [{"type":"string","message":"楼层格式不正确"},{"required":true,"message":"楼层不能为空"},{"min":0,"max":255,"message":"楼层长度必须为0-255"}],
+                        boothFloor: [{"type":"string","message":"楼层格式不正确"},{"required":true,"message":"楼层不能为空"},{"min":0,"max":255,"message":"楼层长度必须为0-255"}],
                         // 名称
                         boothName: [{"type":"string","message":"名称格式不正确"},{"min":0,"max":255,"message":"名称长度必须为0-255"}],
                         // 风格

+ 4 - 4
src/main/webapp/WEB-INF/manager/tf/booth/index.ftl

@@ -38,9 +38,9 @@
                                         <el-col :span=8>
             <!--楼层-->
 
-	        <el-form-item  label="楼层" prop="inputHudra">
+	        <el-form-item  label="楼层" prop="boothFloor">
 	            <el-input
-                        v-model="form.inputHudra"
+                        v-model="form.boothFloor"
                          :disabled="false"
                           :readonly="false"
                           :style="{width:  '100%'}"
@@ -110,7 +110,7 @@
                     <el-table-column type="selection" width="40" :selectable="isChecked"></el-table-column>
                             <el-table-column label="编码"   align="left" prop="boothCode">
                             </el-table-column>
-                            <el-table-column label="楼层"   align="left" prop="inputHudra">
+                            <el-table-column label="楼层"   align="left" prop="boothFloor">
                             </el-table-column>
                             <el-table-column label="名称"   align="left" prop="boothName">
                             </el-table-column>
@@ -161,7 +161,7 @@
         //编码
         {'isSearch':'true','action':'and', 'field': 'BOOTH_CODE', 'el': 'eq', 'model': 'boothCode', 'name': '编码', 'type': 'input'},
         //楼层
-        {'isSearch':'true','action':'and', 'field': 'INPUT_HUDRA', 'el': 'eq', 'model': 'inputHudra', 'name': '楼层', 'type': 'input'},
+        {'isSearch':'true','action':'and', 'field': 'BOOTH_FLOOR', 'el': 'eq', 'model': 'boothFloor', 'name': '楼层', 'type': 'input'},
         //名称
         {'isSearch':'true','action':'and', 'field': 'BOOTH_NAME', 'el': 'eq', 'model': 'boothName', 'name': '名称', 'type': 'input'},
         //风格

+ 7 - 1
src/main/webapp/WEB-INF/manager/tf/exhibitor/form.ftl

@@ -104,6 +104,8 @@
 
             <!--展会ID-->
 
+            <!--邀请码-->
+
             </el-form>
         </el-main>
     </div>
@@ -137,6 +139,8 @@
                     exhibitorUser:'',
                     // 展会ID
                     exhibitorActivities:'',
+                    // 邀请码
+                    exhibitorCode:'',
 
                 },
                 rules:{
@@ -152,6 +156,8 @@
                         exhibitorUser: [{"min":0,"max":255,"message":"用户ID长度必须为0-255"}],
                         // 展会ID
                         exhibitorActivities: [{"min":0,"max":255,"message":"展会ID长度必须为0-255"}],
+                        // 邀请码
+                        exhibitorCode: [{"min":0,"max":255,"message":"邀请码长度必须为0-255"}],
 
                 },
 
@@ -233,7 +239,7 @@
                       } else {
                           res.data.exhibitorLogo = [];
                       }
-                                      
+                                                         
                         that.form = res.data;
                     }
                 });

+ 4 - 0
src/main/webapp/WEB-INF/manager/tf/exhibitor/index.ftl

@@ -110,6 +110,8 @@
                             </el-table-column>
                             <el-table-column label="展会ID"   align="left" prop="exhibitorActivities">
                             </el-table-column>
+                            <el-table-column label="邀请码"   align="left" prop="exhibitorCode">
+                            </el-table-column>
                     <el-table-column  min-width="180" align="center" label="创建时间" prop="createDate"></el-table-column>
                     <el-table-column label="操作"  width="180" align="center" fixed="right">
                             <template #default="scope">
@@ -164,6 +166,8 @@
         {'isSearch':'','action':'and', 'field': 'EXHIBITOR_USER', 'el': 'eq', 'model': 'exhibitorUser', 'name': '用户ID', 'type': 'input'},
         //展会ID
         {'isSearch':'','action':'and', 'field': 'EXHIBITOR_ACTIVITIES', 'el': 'eq', 'model': 'exhibitorActivities', 'name': '展会ID', 'type': 'input'},
+        //邀请码
+        {'isSearch':'','action':'and', 'field': 'EXHIBITOR_CODE', 'el': 'eq', 'model': 'exhibitorCode', 'name': '邀请码', 'type': 'input'},
                 ],
                 dataList: [], //展商列表
                 selectionList:[],//展商列表选中

+ 1 - 1
src/main/webapp/static/locale/lang/booth/en_US.js

@@ -5,7 +5,7 @@ var en_US ={
             placeholder:'请输入编码',
             help:'',
         },
-        inputHudra:{
+        boothFloor:{
             text:'楼层',
             placeholder:'请输入楼层',
             help:'',

+ 1 - 1
src/main/webapp/static/locale/lang/booth/zh_CN.js

@@ -6,7 +6,7 @@ var zh_CN ={
             placeholder:'请输入编码',
             help:'',
         },
-        inputHudra:{
+        boothFloor:{
             text:'楼层',
             placeholder:'请输入楼层',
             help:'',

+ 5 - 0
src/main/webapp/static/locale/lang/exhibitor/en_US.js

@@ -40,5 +40,10 @@ var en_US ={
             placeholder:'请输入展会ID',
             help:'',
         },
+        exhibitorCode:{
+            text:'邀请码',
+            placeholder:'请输入邀请码',
+            help:'',
+        },
     }
 }

+ 5 - 0
src/main/webapp/static/locale/lang/exhibitor/zh_CN.js

@@ -41,5 +41,10 @@ var zh_CN ={
             placeholder:'请输入展会ID',
             help:'',
         },
+        exhibitorCode:{
+            text:'邀请码',
+            placeholder:'请输入邀请码',
+            help:'',
+        },
     }
 }