记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
dea4c4a2
Commit
dea4c4a2
authored
Apr 13, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411
parents
995e306b
b5bd51e4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
GoblinGoodsAnticipateValueVo.java
...ce/goblin/dto/manage/vo/GoblinGoodsAnticipateValueVo.java
+13
-1
GoblinGoodsAnticipateServiceImpl.java
...goblin/service/impl/GoblinGoodsAnticipateServiceImpl.java
+2
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinGoodsAnticipateValueVo.java
View file @
dea4c4a2
...
@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
...
@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
* @since 2022-04-08
* @since 2022-04-08
*/
*/
@Data
@Data
public
class
GoblinGoodsAnticipateValueVo
{
public
class
GoblinGoodsAnticipateValueVo
implements
Cloneable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -92,4 +92,16 @@ public class GoblinGoodsAnticipateValueVo {
...
@@ -92,4 +92,16 @@ public class GoblinGoodsAnticipateValueVo {
@ApiModelProperty
(
value
=
"删除(0:未删除1:已删除)"
)
@ApiModelProperty
(
value
=
"删除(0:未删除1:已删除)"
)
private
Integer
delTag
;
private
Integer
delTag
;
private
static
final
GoblinGoodsAnticipateValueVo
obj
=
new
GoblinGoodsAnticipateValueVo
();
public
static
GoblinGoodsAnticipateValueVo
getNew
()
{
try
{
return
(
GoblinGoodsAnticipateValueVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
GoblinGoodsAnticipateValueVo
();
}
}
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinGoodsAnticipateServiceImpl.java
View file @
dea4c4a2
...
@@ -144,6 +144,8 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
...
@@ -144,6 +144,8 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
anticipateValueVo
.
setState
(
setState
(
anticipateValueVo
.
getAboutStartDate
(),
anticipateValueVo
.
getAboutEndDate
()));
anticipateValueVo
.
setState
(
setState
(
anticipateValueVo
.
getAboutStartDate
(),
anticipateValueVo
.
getAboutEndDate
()));
}
}
pageInfo
.
setPageNum
(
goodsAnticipateValueParam
.
getPageNum
());
pageInfo
.
setPageSize
(
20
);
pageInfo
.
setList
(
data
);
pageInfo
.
setList
(
data
);
pageInfo
.
setTotal
((
Long
)
map
.
get
(
"total"
));
pageInfo
.
setTotal
((
Long
)
map
.
get
(
"total"
));
return
ResponseDto
.
success
(
pageInfo
);
return
ResponseDto
.
success
(
pageInfo
);
...
...
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