* 增加报名信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsMeetingUsrController.java

@@ -133,6 +133,7 @@ public class CpsMeetingUsrController extends BaseController {
         return AjaxResult.success();
     }
 
+
     /**
      * 修改cps_usr_wechat微信用户
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsUsrApplyController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.cp;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.WeChatUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.DateUtils;
@@ -48,6 +49,17 @@ public class CpsUsrApplyController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/regist/list")
+    public TableDataInfo registList() {
+        startPage();
+        WeChatUser loginUser = (WeChatUser) getLoginUser();
+        List<CpsUsrApply> cpsUsrApplies = cpsUsrApplyService.selectCpsUsrApplyList(new CpsUsrApply() {{
+            setUsrWechatId(loginUser.getUserId());
+        }});
+        return getDataTable(cpsUsrApplies);
+    }
+
+
     /**
      * 导出cps_usr_apply与会申请列表
      */

ruoyi-admin/src/main/resources/application-prod.yml

@@ -82,8 +82,8 @@ spring:
           config:
             multi-statement-allow: true
 wechat:
-  appid: wxf385eefdd03327fd
-  app-secret: 7bca97ad298a17539c7c75a5bf337063
+  appid: wxf5aeb6ded4e4488b
+  app-secret: 9d59097282334b5c1a131e9cebac7176
 app:
   cfg:
     role-top-dept-id: 201

ruoyi-system/src/main/java/com/ruoyi/system/domain/CpsUsrApply.java

@@ -1,205 +1,257 @@
 package com.ruoyi.system.domain;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * cps_usr_apply与会申请对象 cps_usr_apply
  *
  * @author ruoyi
- * @date 2024-09-03
+ * @date 2024-09-19
  */
-public class CpsUsrApply extends BaseEntity
-{
+public class CpsUsrApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     private Long id;
 
-    /** 参会人 */
+    /**
+     * 参会人
+     */
     @Excel(name = "参会人")
     private String usrName;
 
-    /** 联系电话 */
+    /**
+     * 联系电话
+     */
     @Excel(name = "联系电话")
     private String tel;
 
-    /** 参会人单位 */
+    /**
+     * 参会人单位
+     */
     @Excel(name = "参会人单位")
     private String orgUnitName;
 
-    /** 参会人职务 */
+    /**
+     * 参会人职务
+     */
     @Excel(name = "参会人职务")
     private String uniLevel;
 
-    /** 邮箱信息 */
+    /**
+     * 邮箱信息
+     */
     @Excel(name = "邮箱信息")
     private String email;
 
-    /** 参会人角色 */
+    /**
+     * 参会人角色
+     */
     @Excel(name = "参会人角色")
     private String usrType;
 
-    /** 现场调研 */
+    /**
+     * 现场调研
+     */
     @Excel(name = "现场调研")
     private String conferenceFlag;
 
-    /** 关联会场报名信息，针对现场调研的报名信息 */
+    /**
+     * 关联会场报名信息，针对现场调研的报名信息
+     */
     private Long conferenceRel;
 
-    /** 申请类型 */
+    /**
+     * 申请类型
+     */
     @Excel(name = "申请类型")
     private String applyType;
 
-    /** 审核状态 */
+    /**
+     * 审核状态
+     */
     @Excel(name = "审核状态")
     private String reviewState;
 
-    /** 审核不通过原因 */
-    @Excel(name = "备注")
+    /**
+     * 审核不通过原因
+     */
+    @Excel(name = "审核信息")
     private String reviewMsg;
 
-    /** 微信用户主键 */
+    /**
+     * 微信用户主键
+     */
     private Long usrWechatId;
 
-    /** 与会内容 */
+    /**
+     * 与会内容
+     */
     private Long contentId;
     @Excel(name = "与会内容")
     private String contentTitle;
 
     private String deptId;
 
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "来程方式")
+    private String wayComing;
+
+    /**
+     * 来程信息
+     */
+    @Excel(name = "来程信息")
+    private String comInfo;
+
+    /**
+     * $column.columnComment
+     */
+    @Excel(name = "回程方式")
+    private String wayBack;
+
+    /**
+     * 返程信息
+     */
+    @Excel(name = "返程信息")
+    private String backInfo;
+
     private CpsContentInfo content;
 
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
-    public void setUsrName(String usrName)
-    {
+
+    public void setUsrName(String usrName) {
         this.usrName = usrName;
     }
 
-    public String getUsrName()
-    {
+    public String getUsrName() {
         return usrName;
     }
-    public void setTel(String tel)
-    {
+
+    public void setTel(String tel) {
         this.tel = tel;
     }
 
-    public String getTel()
-    {
+    public String getTel() {
         return tel;
     }
-    public void setOrgUnitName(String orgUnitName)
-    {
+
+    public void setOrgUnitName(String orgUnitName) {
         this.orgUnitName = orgUnitName;
     }
 
-    public String getOrgUnitName()
-    {
+    public String getOrgUnitName() {
         return orgUnitName;
     }
-    public void setUniLevel(String uniLevel)
-    {
+
+    public void setUniLevel(String uniLevel) {
         this.uniLevel = uniLevel;
     }
 
-    public String getUniLevel()
-    {
+    public String getUniLevel() {
         return uniLevel;
     }
-    public void setEmail(String email)
-    {
+
+    public void setEmail(String email) {
         this.email = email;
     }
 
-    public String getEmail()
-    {
+    public String getEmail() {
         return email;
     }
-    public void setUsrType(String usrType)
-    {
+
+    public void setUsrType(String usrType) {
         this.usrType = usrType;
     }
 
-    public String getUsrType()
-    {
+    public String getUsrType() {
         return usrType;
     }
-    public void setConferenceFlag(String conferenceFlag)
-    {
+
+    public void setConferenceFlag(String conferenceFlag) {
         this.conferenceFlag = conferenceFlag;
     }
 
-    public String getConferenceFlag()
-    {
+    public String getConferenceFlag() {
         return conferenceFlag;
     }
-    public void setConferenceRel(Long conferenceRel)
-    {
+
+    public void setConferenceRel(Long conferenceRel) {
         this.conferenceRel = conferenceRel;
     }
 
-    public Long getConferenceRel()
-    {
+    public Long getConferenceRel() {
         return conferenceRel;
     }
-    public void setApplyType(String applyType)
-    {
+
+    public void setApplyType(String applyType) {
         this.applyType = applyType;
     }
 
-    public String getApplyType()
-    {
+    public String getApplyType() {
         return applyType;
     }
-    public void setReviewState(String reviewState)
-    {
+
+    public void setReviewState(String reviewState) {
         this.reviewState = reviewState;
     }
 
-    public String getReviewState()
-    {
+    public String getReviewState() {
         return reviewState;
     }
-    public void setReviewMsg(String reviewMsg)
-    {
+
+    public void setReviewMsg(String reviewMsg) {
         this.reviewMsg = reviewMsg;
     }
 
-    public String getReviewMsg()
-    {
+    public String getReviewMsg() {
         return reviewMsg;
     }
-    public void setUsrWechatId(Long usrWechatId)
-    {
+
+    public void setUsrWechatId(Long usrWechatId) {
         this.usrWechatId = usrWechatId;
     }
 
-    public Long getUsrWechatId()
-    {
+    public Long getUsrWechatId() {
         return usrWechatId;
     }
-    public void setContentId(Long contentId)
-    {
+
+    public void setContentId(Long contentId) {
         this.contentId = contentId;
     }
 
-    public Long getContentId()
-    {
+    public Long getContentId() {
         return contentId;
     }
 
+    public void setContentTitle(String contentTitle) {
+        this.contentTitle = contentTitle;
+    }
+
+    public String getContentTitle() {
+        return contentTitle;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getDeptId() {
+        return deptId;
+    }
+
     public CpsContentInfo getContent() {
         return content;
     }
@@ -208,44 +260,40 @@ public class CpsUsrApply extends BaseEntity
         this.content = content;
     }
 
+    public void setWayComing(String wayComing) {
+        this.wayComing = wayComing;
+    }
 
-    public String getContentTitle() {
-        return contentTitle;
+    public String getWayComing() {
+        return wayComing;
     }
 
-    public void setContentTitle(String contentTitle) {
-        this.contentTitle = contentTitle;
+    public void setComInfo(String comInfo) {
+        this.comInfo = comInfo;
     }
 
-    public String getDeptId() {
-        return deptId;
+    public String getComInfo() {
+        return comInfo;
     }
 
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
+    public void setWayBack(String wayBack) {
+        this.wayBack = wayBack;
+    }
+
+    public String getWayBack() {
+        return wayBack;
+    }
+
+    public void setBackInfo(String backInfo) {
+        this.backInfo = backInfo;
+    }
+
+    public String getBackInfo() {
+        return backInfo;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("usrName", getUsrName())
-            .append("tel", getTel())
-            .append("orgUnitName", getOrgUnitName())
-            .append("uniLevel", getUniLevel())
-            .append("email", getEmail())
-            .append("usrType", getUsrType())
-            .append("conferenceFlag", getConferenceFlag())
-            .append("conferenceRel", getConferenceRel())
-            .append("applyType", getApplyType())
-            .append("reviewState", getReviewState())
-            .append("reviewMsg", getReviewMsg())
-            .append("usrWechatId", getUsrWechatId())
-            .append("contentId", getContentId())
-            .append("updateTime", getUpdateTime())
-            .append("createTime", getCreateTime())
-            .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("usrName", getUsrName()).append("tel", getTel()).append("orgUnitName", getOrgUnitName()).append("uniLevel", getUniLevel()).append("email", getEmail()).append("usrType", getUsrType()).append("conferenceFlag", getConferenceFlag()).append("conferenceRel", getConferenceRel()).append("applyType", getApplyType()).append("reviewState", getReviewState()).append("reviewMsg", getReviewMsg()).append("usrWechatId", getUsrWechatId()).append("contentId", getContentId()).append("contentTitle", getContentTitle()).append("deptId", getDeptId()).append("wayComing", getWayComing()).append("comInfo", getComInfo()).append("wayBack", getWayBack()).append("backInfo", getBackInfo()).append("remark", getRemark()).append("updateTime", getUpdateTime()).append("createTime", getCreateTime()).append("createBy", getCreateBy()).append("updateBy", getUpdateBy()).toString();
     }
 }

ruoyi-system/src/main/resources/mapper/cp/CpsUsrApplyMapper.xml

@@ -21,6 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="contentId"    column="content_id"    />
         <result property="contentTitle" column="content_title"/>
         <result property="deptId" column="dept_id"/>
+        <result property="wayComing"    column="way_coming"    />
+        <result property="comInfo"    column="com_info"    />
+        <result property="wayBack"    column="way_back"    />
+        <result property="backInfo"    column="back_info"    />
+        <result property="remark"    column="remark"    />
         <result property="updateTime"    column="update_time"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
@@ -43,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                usr_wechat_id,
                content_id,
                content_title,
-               dept_id,
+               dept_id, way_coming, com_info, way_back, back_info, remark,
                update_time,
                create_time,
                create_by,
@@ -62,6 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conferenceFlag != null  and conferenceFlag != ''"> and conference_flag = #{conferenceFlag}</if>
             <if test="applyType != null  and applyType != ''"> and apply_type = #{applyType}</if>
             <if test="reviewState != null  and reviewState != ''"> and review_state = #{reviewState}</if>
+            <if test="wayComing != null  and wayComing != ''"> and way_coming = #{wayComing}</if>
+            <if test="wayBack != null  and wayBack != ''"> and way_back = #{wayBack}</if>
             ${params.dataScope}
         </where>
     </select>
@@ -94,6 +101,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contentId != null">content_id,</if>
             <if test="contentTitle !=null">content_title,</if>
             <if test="deptId !=null">dept_id,</if>
+            <if test="wayComing != null">way_coming,</if>
+            <if test="comInfo != null">com_info,</if>
+            <if test="wayBack != null">way_back,</if>
+            <if test="backInfo != null">back_info,</if>
+            <if test="remark != null">remark,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
@@ -115,6 +127,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contentId != null">#{contentId},</if>
             <if test="contentTitle !=null">#{contentTitle},</if>
             <if test="deptId !=null">#{deptId},</if>
+            <if test="wayComing != null">#{wayComing},</if>
+            <if test="comInfo != null">#{comInfo},</if>
+            <if test="wayBack != null">#{wayBack},</if>
+            <if test="backInfo != null">#{backInfo},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -140,6 +157,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contentId != null">content_id,</if>
             <if test="contentTitle !=null">content_title,</if>
             <if test="deptId !=null">dept_id,</if>
+            <if test="wayComing != null">way_coming,</if>
+            <if test="comInfo != null">com_info,</if>
+            <if test="wayBack != null">way_back,</if>
+            <if test="backInfo != null">back_info,</if>
+            <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
             update_time,
@@ -161,6 +183,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contentId != null">#{contentId},</if>
             <if test="contentTitle !=null">#{contentTitle},</if>
             <if test="deptId !=null">#{deptId},</if>
+            <if test="wayComing != null">#{wayComing},</if>
+            <if test="comInfo != null">#{comInfo},</if>
+            <if test="wayBack != null">#{wayBack},</if>
+            <if test="backInfo != null">#{backInfo},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             now(),
@@ -182,6 +209,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contentId != null">content_id = VALUES(content_id),</if>
             <if test="contentTitle !=null">content_title = VALUES(content_title),</if>
             <if test="deptId !=null">dept_id = VALUES(dept_id),</if>
+            <if test="wayComing != null">way_coming = VALUES(way_coming),</if>
+            <if test="comInfo != null">com_info = VALUES(com_info),</if>
+            <if test="wayBack != null">way_back = VALUES(way_back),</if>
+            <if test="backInfo != null">back_info = VALUES(back_info),</if>
+            <if test="remark != null">remark = VALUES(remark),</if>
             <if test="updateBy != null">update_by = VALUES(update_by),</if>
             conference_rel = VALUES(conference_rel),
             update_time = now()
@@ -206,6 +238,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contentId != null">content_id = #{contentId},</if>
             <if test="contentTitle !=null">content_title = #{contentTitle},</if>
             <if test="deptId !=null">dept_id = #{deptId},</if>
+            <if test="wayComing != null">way_coming = #{wayComing},</if>
+            <if test="comInfo != null">com_info = #{comInfo},</if>
+            <if test="wayBack != null">way_back = #{wayBack},</if>
+            <if test="backInfo != null">back_info = #{backInfo},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

ruoyi-ui/src/views/cp/usrApply/index.vue

@@ -127,40 +127,53 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="usrApplyList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange" style="width: 100%">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="参会人" align="center" prop="usrName" />
-      <el-table-column label="联系电话" align="center" prop="tel" />
-      <el-table-column label="参会人单位" align="center" prop="orgUnitName" />
-      <el-table-column label="参会人职务" align="center" prop="uniLevel" />
-      <el-table-column label="邮箱信息" align="center" prop="email" />
-      <el-table-column label="参会人角色" align="center" prop="usrType">
+      <el-table-column label="参会人" align="center" prop="usrName" width="100" fixed />
+      <el-table-column label="联系电话" align="center" prop="tel" width="100"  fixed />
+      <el-table-column label="参会人单位" align="center" prop="orgUnitName" width="150"  fixed show-overflow-tooltip/>
+      <el-table-column label="参会人职务" align="center" prop="uniLevel"  width="150" fixed/>
+      <el-table-column label="邮箱信息" align="center" prop="email" width="100"/>
+      <el-table-column label="参会人角色" align="center" prop="usrType" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.met_usr_type" :value="scope.row.usrType" />
         </template>
       </el-table-column>
-      <el-table-column label="现场调研" align="center" prop="conferenceFlag" v-if="this.applyType == 1">
+      <el-table-column label="现场调研" align="center" prop="conferenceFlag" width="55" v-if="this.applyType == 1">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.conference_flag" :value="scope.row.conferenceFlag" />
         </template>
       </el-table-column>
-      <el-table-column label="申请类型" align="center" prop="applyType">
+      <el-table-column label="申请类型" align="center" prop="applyType" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.apply_type" :value="scope.row.applyType" />
         </template>
       </el-table-column>
-      <el-table-column label="审核状态" align="center" prop="reviewState">
+      <el-table-column label="审核状态" align="center" prop="reviewState" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.review_state" :value="scope.row.reviewState" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="reviewMsg" />
-      <el-table-column label="与会内容" align="center" prop="contentTitle" />
+      <el-table-column label="审核信息" align="center" prop="reviewMsg" width="150" show-overflow-tooltip/>
+      <el-table-column label="与会内容" align="center" prop="contentTitle" width="150" />
+      <el-table-column label="来程方式" align="center" prop="wayComing" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tfc_type" :value="scope.row.wayComing"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="来程信息" align="center" prop="comInfo" width="150"/>
+      <el-table-column label="返程方式" align="center" prop="wayBack" width="150">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tfc_type" :value="scope.row.wayBack"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="返程信息" align="center" prop="backInfo" width="150"/>
+      <el-table-column label="备注" align="center" prop="remark" width="150" show-overflow-tooltip />
       <el-table-column label="创建时间" align="center" prop="updateTime" width="80">
       </el-table-column>
       <el-table-column label="修改时间" align="center" prop="createTime" width="80">
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" >
         <template slot-scope="scope">
           <el-button
               size="mini"
@@ -257,8 +270,35 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="备注" prop="reviewMsg">
-          <el-input v-model="form.reviewMsg" type="textarea" rows="3" placeholder="请输入备注" />
+        <el-form-item label="审核信息" prop="reviewMsg">
+          <el-input v-model="form.reviewMsg" type="textarea" rows="3" placeholder="请输入审核信息" />
+        </el-form-item>
+        <el-form-item label="来程方式" prop="wayComing">
+          <el-radio-group v-model="form.wayComing">
+            <el-radio
+                v-for="dict in dict.type.tfc_type"
+                :key="dict.value"
+                :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="车次/航班/高速公路出入口" prop="comInfo">
+          <el-input v-model="form.comInfo" placeholder="请输入车次/航班/高速公路出入口" />
+        </el-form-item>
+        <el-form-item label="返程方式" prop="wayBack">
+          <el-radio-group v-model="form.wayBack">
+            <el-radio
+                v-for="dict in dict.type.tfc_type"
+                :key="dict.value"
+                :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="车次/航班/高速公路出入口" prop="backInfo">
+          <el-input v-model="form.backInfo" placeholder="请输入车次/航班/高速公路出入口" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -278,8 +318,8 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="备注" prop="reviewMsg">
-          <el-input v-model="form.reviewMsg" type="textarea" rows="3" placeholder="请输入备注" />
+        <el-form-item label="审核信息" prop="reviewMsg">
+          <el-input v-model="form.reviewMsg" type="textarea" rows="3" placeholder="审核信息" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -295,7 +335,7 @@ import { addUsrApply, delUsrApply, getUsrApply, listUsrApply, rejectUsrApply, up
 
 export default {
   name: 'UsrApply',
-  dicts: ['apply_type', 'conference_flag', 'review_state', 'met_usr_type'],
+  dicts: ['apply_type', 'conference_flag', 'review_state', 'met_usr_type',"tfc_type"],
   data() {
     return {
       // 遮罩层
@@ -329,7 +369,11 @@ export default {
         conferenceFlag: null,
         applyType: this.$route.query.meetingType,
         reviewState: null,
-
+        wayComing: null,
+        comInfo: null,
+        wayBack: null,
+        backInfo: null,
+        remark: null
       },
       applyType: '',
       // 表单参数
@@ -420,8 +464,12 @@ export default {
         applyType: this.$route.query.meetingType,
         reviewState: null,
         reviewMsg: null,
-        usrWechatId: null,
         contentId: null,
+        wayComing: null,
+        comInfo: null,
+        wayBack: null,
+        backInfo: null,
+        remark: null,
         updateTime: null,
         createTime: null,
         createBy: null,

ry.bat

@@ -5,7 +5,7 @@ set AppName=ruoyi-admin.jar
 
 set JarPath=./out/ruoyi-admin.jar
 
-set Env=prod
+set Env=test
 
 rem JVM参数
 set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"