From bbda2ee1af4e86d76f93e00386d77efb56c60d5f Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期六, 23 七月 2022 15:42:06 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseOperation.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseOperation.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseOperation.java
index 76b4632..5623d45 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseOperation.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActWarehouseOperation.java
@@ -22,15 +22,12 @@
  * @since 2021-10-09 17:14:33
  */
 @Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
 @ApiModel("爱心义操作表")
 public class ComActWarehouseOperation implements Serializable {
 
     private static final long serialVersionUID = -74893029545359720L;
 
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.ASSIGN_ID)
     private Integer id;
 
     /**
@@ -57,4 +54,20 @@
     @ApiModelProperty(value = "操作人")
     private Integer userId;
 
+    /**
+     *类型 1签收,取消操作 2捐赠操作
+     */
+    @ApiModelProperty(value = "类型 1签收,取消操作 2捐赠操作")
+    private Integer type;
+
+    /**
+     * 申请id
+     */
+    @ApiModelProperty(value = "申请id")
+    private Integer applyId;
+
+    public interface type{
+        int bxs=1;
+        int xs=2;
+    }
 }

--
Gitblit v1.7.1