From 21841bcabeaa4d9198d6911ed53d95c5488d50f7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 31 三月 2023 10:32:40 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/ModelController.java | 2 +-
Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/entity/ModelPrototype.java | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/ModelController.java b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/ModelController.java
index 0fb67c8..55bde02 100644
--- a/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/ModelController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/controller/ModelController.java
@@ -220,7 +220,7 @@
.columnNaming(NamingStrategy.underline_to_camel).build();
DataSourceConfig datasourceConfig = new DataSourceConfig.Builder(
datasource.getUrl(), datasource.getUsername(), datasource.getPassword()
- ).build();
+ ).schema(datasource.getUsername()).build();
return new ConfigBuilder(null, datasourceConfig, strategyConfig, null, null, null);
}
diff --git a/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/entity/ModelPrototype.java b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/entity/ModelPrototype.java
index f507c18..b51e565 100644
--- a/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/entity/ModelPrototype.java
+++ b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/java/com/vci/ubcs/develop/entity/ModelPrototype.java
@@ -16,6 +16,7 @@
*/
package com.vci.ubcs.develop.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -73,6 +74,7 @@
* 娉ㄩ噴璇存槑
*/
@ApiModelProperty(value = "娉ㄩ噴璇存槑")
+ @TableField("\"COMMENT\"")
private String comment;
/**
* 鍒楄〃鏄剧ず
--
Gitblit v1.9.3