Commit 377d7a0a authored by 陈明豪's avatar 陈明豪

bug修改

parent 6a836378
...@@ -540,7 +540,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos ...@@ -540,7 +540,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
} }
@Override @Override
public ImportVistInfoDTO importUserExcel(MultipartFile file) throws ParseException { public ImportVistInfoDTO importUserExcel(MultipartFile file,HttpServletResponse response) throws ParseException {
ImportVistInfoDTO importVistInfoDTO = new ImportVistInfoDTO(); ImportVistInfoDTO importVistInfoDTO = new ImportVistInfoDTO();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
String nowTime = new SimpleDateFormat("yyyyMMddHHmmss").format(calendar.getTime()); String nowTime = new SimpleDateFormat("yyyyMMddHHmmss").format(calendar.getTime());
......
...@@ -17,6 +17,8 @@ mybatis-plus: ...@@ -17,6 +17,8 @@ mybatis-plus:
db-config: db-config:
logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-delete-value: 1 # 逻辑已删除值(默认为 1)
logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
spring: spring:
main: main:
...@@ -44,7 +46,7 @@ spring: ...@@ -44,7 +46,7 @@ spring:
host: ${cy_redis.ip} host: ${cy_redis.ip}
port: ${cy_redis.port} port: ${cy_redis.port}
database: 0 database: 0
password: ${cy_redis.password} password:
timeout: 3000 timeout: 3000
jedis: jedis:
pool: pool:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment