From df82bf5bc62102b2232fe0b8d204707226f6286e Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 5 Sep 2023 16:15:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=20?=
 =?UTF-8?q?=E5=85=88=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
index 7bfab79..53adab4 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -115,7 +115,7 @@ public class GovProjectCollectionManage {
                 .le(Objects.nonNull(req.getCreateOnMax()),GovBizProjectBaseinfo::getTongTime,req.getCreateOnMax())
                 .eq(GovBizProjectBaseinfo::getDeleted,Boolean.FALSE)
                 .orderByDesc(GovBizProjectBaseinfo::getBizTime);
-        permissions(wrapper);
+//        permissions(wrapper);
         baseinfoService.page(page,wrapper);
 
         if(CollUtil.isEmpty(page.getRecords())){

From 858ba34f88e361f84de256be71642027d18225ad Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 5 Sep 2023 17:04:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/gov/model/entity/GovBizProjectDraft.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectDraft.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectDraft.java
index a47d767..e1d0af8 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectDraft.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectDraft.java
@@ -1,7 +1,10 @@
 package com.ningdatech.pmapi.gov.model.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,6 +22,8 @@ import java.time.LocalDateTime;
 public class GovBizProjectDraft implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.AUTO)
     private Long id;
     private String baseProjId;
     private String baseProjName;