Merge branch '20230904-project-collection-2.0' of http://git.ningdatech.com/liushuai/project-management into dev

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())){

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;