From 17b8d077f7efe3db20344987cdad9da9d9ab3de6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 03 十一月 2023 15:21:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
index 7334872..6dc8f99 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
@@ -32,7 +32,7 @@
          ps.setInt(1, glassid);
          rs= ps.executeQuery();
          while (rs.next()) {
-			glass.setOrderId(rs.getShort("orderid"));
+			glass.setOrderId(rs.getString("orderid"));
          }
 		 conn.close();
          return glass;
@@ -56,7 +56,7 @@
 	 */
 	public static Connection getConn() throws SQLException {
 		Connection conn = null;
-		conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadameserp?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
+		conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
 		return conn;
 	}
 

--
Gitblit v1.8.0