Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Backend into hjb

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -332,10 +332,14 @@ public class CaseApplication  extends BaseEntity {
      * 申请人主体信息
      */
     /** 姓名 */
-    @Excel(name = "申请人主体信息-申请人姓名",width = 26)
+    @Excel(name = "申请人主体信息-申请人(机构)",width = 26)
     private String name;
+    /**
+     * 申请人主体信息-申请人(机构)id
+     */
+    private String nameId;
     /** 身份证号 */
-    @Excel(name = "申请人主体信息-身份证号",width = 26)
+    @Excel(name = "申请人主体信息-代码",width = 26)
     private String identityNum;
 
     /** 联系电话 */
@@ -415,6 +419,14 @@ public class CaseApplication  extends BaseEntity {
         this.name = name;
     }
 
+    public String getNameId() {
+        return nameId;
+    }
+
+    public void setNameId(String nameId) {
+        this.nameId = nameId;
+    }
+
     public String getIdentityNum() {
         return identityNum;
     }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseLogRecord.java

@@ -25,6 +25,15 @@ public class CaseLogRecord     extends BaseEntity {
 
     /** 案件编号 */
     private String caseNum;
+    /**
+     * 展示的内容
+     */
+    private String content;
+    /**
+     * 用户昵称
+     */
+    private String createNickName;
+
 
     public String getCaseNum() {
         return caseNum;
@@ -50,7 +59,7 @@ public class CaseLogRecord     extends BaseEntity {
         this.caseAppliId = caseAppliId;
     }
 
-    public int getCaseNode() {
+    public Integer getCaseNode() {
         return caseNode;
     }
 
@@ -73,4 +82,24 @@ public class CaseLogRecord     extends BaseEntity {
     public void setNotes(String notes) {
         this.notes = notes;
     }
+
+    public void setCaseNode(Integer caseNode) {
+        this.caseNode = caseNode;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getCreateNickName() {
+        return createNickName;
+    }
+
+    public void setCreateNickName(String nickName) {
+        this.createNickName = nickName;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseLogVO.java

@@ -1,29 +0,0 @@
-package com.ruoyi.wisdomarbitrate.domain.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @description 案件操作日志实体
- * @Author wangqiong
- * @Date 2023/10/09 15:18
- * @Version V1.0
- **/
-@Data
-public class CaseLogVO {
-    /**日志id*/
-    private String logId;
-    /**操作人id*/
-    private String operatorId;
-    /**操作人名称*/
-    private String operatorName;
-    /**操作人ip*/
-    private String ip;
-    /**操作时间*/
-    private Date operateTime;
-    /**操作明细*/
-    private String operateDetail;
-    /**操作类型*/
-    private String operateType;
-}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/SendRoomNoMessageVO.java

@@ -0,0 +1,24 @@
+package com.ruoyi.wisdomarbitrate.domain.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author wangqiong
+ * @description 发送房间号短信入参类
+ * @date 2023-10-10 15:20
+ */
+@Data
+public class SendRoomNoMessageVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @NotNull(message = "案件id不能为空")
+    private Long id;
+    @NotEmpty(message = "房间号不能为空")
+    private String roomNo;
+
+
+
+}