diff --git a/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java b/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java index 84f5af3fae320b80126e498f680ae2ec38beeb91..47d0886ccd1d8a3c9966913afae5acdbf0d68672 100644 --- a/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java +++ b/src/main/java/com/pms/ocp/model/vo/OcpModelGroupVO.java @@ -1,6 +1,8 @@ package com.pms.ocp.model.vo; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -8,6 +10,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.lang.reflect.Type; import java.util.Date; import java.util.List; @@ -26,6 +29,7 @@ public class OcpModelGroupVO implements Serializable { * 主键 */ @ApiModelProperty(value = "主键") + @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; /** * 模型分类名称 diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 0f73a771b24d9d846ed7b0ba83cb759e686069ba..759ae80b12c0f3876c94ab5f9a404a9ac463bc05 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -6,7 +6,7 @@ spring: type: com.zaxxer.hikari.HikariDataSource # jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true # jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true - url: jdbc:postgresql://localhost:5432/postgres?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true + url: jdbc:postgresql://localhost:5432/operating_platform?stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true knife4j: enable: true