From da9a4f7ad988c452f3a356989eaf7a6c06ae5032 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 26 九月 2024 23:03:05 +0800
Subject: [PATCH] fix:合并代码
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index afd3e77..da86413 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -385,7 +385,7 @@
if(one == null){
return R.failed("鏈煡璇㈠埌杞﹁締瀛樺湪");
}else {
- if(one.getCarNo().equals("鏃犵墝杞�")){
+ if(one.getCarNo().equals("_鏃燺")){
enterPark.setCreateTime(LocalDateTime.now());
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -748,9 +748,9 @@
}
}
}
- if(StringUtils.isBlank(carDay) && !carNo.equals("鏃犵墝杞�")){
+ if(StringUtils.isBlank(carDay) && !carNo.equals("_鏃燺")){
carDay = "娆㈣繋鍏変复";
- }else if(StringUtils.isBlank(carDay) && carNo.equals("鏃犵墝杞�")){
+ }else if(StringUtils.isBlank(carDay) && carNo.equals("_鏃燺")){
carDay = "鎷掔粷椹跺叆";
}
@@ -774,7 +774,7 @@
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
- if(!carNo.equals("鏃犵墝杞�")){
+ if(!carNo.equals("_鏃燺")){
open(request,response,data1);//鍏ュ満寮�闂�
}else {
noOpen(request,response,data1);
@@ -849,7 +849,7 @@
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
if(type == 0){
- if(carNo.equals("鏃犵墝杞�")){
+ if(carNo.equals("_鏃燺")){
noOpen(request,response,data1);
}else {
if(timeStamp.contains("璁板綍寮傚父")){
--
Gitblit v1.9.1