Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
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
项目统一框架
amos-boot-biz
Commits
5a076e8b
Commit
5a076e8b
authored
Jun 21, 2023
by
KeYong
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop_dl_3.7.0.9' into develop_dl_3.7.0.9
parents
f6edb52b
7e9c0b42
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
InputItemController.java
.../amos/patrol/business/controller/InputItemController.java
+2
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java
View file @
5a076e8b
...
@@ -713,8 +713,8 @@ public class InputItemController extends AbstractBaseController {
...
@@ -713,8 +713,8 @@ public class InputItemController extends AbstractBaseController {
}
}
//如果为1则为否,顺应机场逻辑
//如果为1则为否,顺应机场逻辑
param
.
setCustomType
(
"1"
.
equals
(
param
.
getCustomType
())
?
null
:
param
.
getCustomType
());
/*
param.setCustomType("1".equals(param.getCustomType()) ? null : param.getCustomType());
param
.
setKeyPartsType
(
"1"
.
equals
(
param
.
getKeyPartsType
())
?
null
:
param
.
getKeyPartsType
());
param.setKeyPartsType("1".equals(param.getKeyPartsType()) ? null : param.getKeyPartsType());
*/
AgencyUserModel
user
=
getUserInfo
();
AgencyUserModel
user
=
getUserInfo
();
if
(
ObjectUtils
.
isEmpty
(
user
))
{
if
(
ObjectUtils
.
isEmpty
(
user
))
{
return
CommonResponseUtil
.
failure
(
"用户session过期"
);
return
CommonResponseUtil
.
failure
(
"用户session过期"
);
...
...
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