Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
9d5b22fd
Commit
9d5b22fd
authored
4 years ago
by
dengshichuan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dsc' into 'develop'
Dsc See merge request 8timerv2/8timerapiv200!266
parents
bb8eb64c
2d1d6914
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletions
+5
-1
src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java
+3
-0
src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
+2
-1
No files found.
src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java
View file @
9d5b22fd
...
...
@@ -58,6 +58,9 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
@ApiModelProperty
(
value
=
"电话号码 "
,
example
=
"18712345678"
)
private
String
phone
;
@ApiModelProperty
(
value
=
"邮编 "
,
example
=
"110000"
)
private
String
zipCode
;
@ApiModelProperty
(
value
=
"所在地区id"
,
example
=
"广东省广州市白云区"
)
private
String
area
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
View file @
9d5b22fd
...
...
@@ -298,7 +298,8 @@ public class QyzxBusinessController {
.
eq
(
QyzxUseRecord:
:
getPmid
,
1
)
.
eq
(
StringUtils
.
isNotBlank
(
orderNo
),
QyzxUseRecord:
:
getOrderNo
,
orderNo
)
.
ge
(
StringUtils
.
isNotBlank
(
startTime
),
QyzxUseRecord:
:
getCreateTime
,
startTime
)
.
le
(
StringUtils
.
isNotBlank
(
endTime
),
QyzxUseRecord:
:
getCreateTime
,
endTime
));
.
le
(
StringUtils
.
isNotBlank
(
endTime
),
QyzxUseRecord:
:
getCreateTime
,
endTime
)
.
last
(
"order by create_time desc"
));
return
ResultUtil
.
pageData
(
list
,
page
.
getTotal
(),
"查询成功"
);
}
...
...
This diff is collapsed.
Click to expand it.
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