From 128dfa5e1407751bc208c1999930b14c3eb864d8 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 17 二月 2025 14:27:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-server/src/main/resources/application-prod.yml | 2 +-
rsf-admin/src/i18n/en.js | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 4288984..8202d8b 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -123,6 +123,8 @@
customer: 'Customer',
shipper: 'shipper',
matnr: 'Matnr',
+ matnrGroup: 'MatnrGroup',
+
},
table: {
field: {
diff --git a/rsf-server/src/main/resources/application-prod.yml b/rsf-server/src/main/resources/application-prod.yml
index 639421d..a419dc7 100644
--- a/rsf-server/src/main/resources/application-prod.yml
+++ b/rsf-server/src/main/resources/application-prod.yml
@@ -10,7 +10,7 @@
static-path-pattern: /**
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/rsf
+ url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: 34821015
type: com.alibaba.druid.pool.DruidDataSource
--
Gitblit v1.9.1