Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 81b0f9b4
authored
Jul 17, 2023
by
王力
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_orderlist0717' into 'develop'
修改返回值如果为null也返回值字段 See merge request !251
2 parents
a318cbb9
cfd6248a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/DispatchEngineerOrderListResp.java
project-order/src/main/java/com/dituhui/pea/order/dto/DispatchOrderListResp.java
project-order/src/main/java/com/dituhui/pea/order/dto/DispatchEngineerOrderListResp.java
View file @
81b0f9b
package
com
.
dituhui
.
pea
.
order
.
dto
;
package
com
.
dituhui
.
pea
.
order
.
dto
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.List
;
import
java.util.List
;
...
@@ -18,6 +19,8 @@ public class DispatchEngineerOrderListResp {
...
@@ -18,6 +19,8 @@ public class DispatchEngineerOrderListResp {
private
String
grade
;
private
String
grade
;
private
List
<
OrderInfo
>
orders
;
private
List
<
OrderInfo
>
orders
;
}
}
@JsonInclude
(
JsonInclude
.
Include
.
ALWAYS
)
@Data
@Data
public
static
class
OrderInfo
{
public
static
class
OrderInfo
{
private
boolean
weight
;
private
boolean
weight
;
...
...
project-order/src/main/java/com/dituhui/pea/order/dto/DispatchOrderListResp.java
View file @
81b0f9b
package
com
.
dituhui
.
pea
.
order
.
dto
;
package
com
.
dituhui
.
pea
.
order
.
dto
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.List
;
import
java.util.List
;
...
@@ -8,6 +9,7 @@ import java.util.List;
...
@@ -8,6 +9,7 @@ import java.util.List;
public
class
DispatchOrderListResp
{
public
class
DispatchOrderListResp
{
private
List
<
Order
>
orders
;
private
List
<
Order
>
orders
;
@JsonInclude
(
JsonInclude
.
Include
.
ALWAYS
)
@Data
@Data
public
static
class
Order
{
public
static
class
Order
{
private
boolean
weight
;
private
boolean
weight
;
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment