Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
entrance_api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王琮
entrance_api
Commits
377d7a0a
Commit
377d7a0a
authored
Dec 12, 2022
by
陈明豪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修改
parent
6a836378
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
VisitInfomationServiceImpl.java
...ft/sys/visit/service/impl/VisitInfomationServiceImpl.java
+1
-1
application-common.yml
src/main/resources/application-common.yml
+3
-1
No files found.
src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java
View file @
377d7a0a
...
...
@@ -540,7 +540,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
}
@Override
public
ImportVistInfoDTO
importUserExcel
(
MultipartFile
file
)
throws
ParseException
{
public
ImportVistInfoDTO
importUserExcel
(
MultipartFile
file
,
HttpServletResponse
response
)
throws
ParseException
{
ImportVistInfoDTO
importVistInfoDTO
=
new
ImportVistInfoDTO
();
Calendar
calendar
=
Calendar
.
getInstance
();
String
nowTime
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
).
format
(
calendar
.
getTime
());
...
...
src/main/resources/application-common.yml
View file @
377d7a0a
...
...
@@ -17,6 +17,8 @@ mybatis-plus:
db-config
:
logic-delete-value
:
1
# 逻辑已删除值(默认为 1)
logic-not-delete-value
:
0
# 逻辑未删除值(默认为 0)
configuration
:
log-impl
:
org.apache.ibatis.logging.stdout.StdOutImpl
spring
:
main
:
...
...
@@ -44,7 +46,7 @@ spring:
host
:
${cy_redis.ip}
port
:
${cy_redis.port}
database
:
0
password
:
${cy_redis.password}
password
:
timeout
:
3000
jedis
:
pool
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment