From f6b439c8958e7e0520057404b7226c7507f5d1a1 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 11 四月 2024 18:01:23 +0800
Subject: [PATCH] 报告生成功能：支持数据填充，发现单元格合并bug，发现模板重复
---
system-run/src/main/resources/application-dev.yml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 81460b6..2b36d65 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -5,12 +5,12 @@
logging:
config: classpath:logback-spring.xml
# 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- file-location: D:\楣撻洀鍏徃\frame-after\logs
+ file-location: D:\Download\log
# 鏁版嵁搴撳浠借矾寰�
backup:
# 鏁版嵁搴撳浠借矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- path: D:\楣撻洀鍏徃\frame-after
+ path: #D:\Download\log
# 鏁版嵁搴撳浠藉ぉ鏁�
destiny: 7
# 鏁版嵁搴撳浠藉伐鍏疯矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
@@ -18,9 +18,11 @@
# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
file:
- path: D:/webapp/images
+ path: D:\Download\鍏徃瀛樺偍鍦板潃
# 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
allowed: png,jpg,jpeg,gif
+
+wordUrl: D:\Download\鍏徃瀛樺偍鍦板潃
mybatis-plus:
type-aliases-package: com.yuanchu.mom.pojo
@@ -34,7 +36,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: root
password: 123456
druid:
--
Gitblit v1.9.3