Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-common
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4d353a0a
authored
Jul 30, 2021
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
置换卷
parent
26bd21a5
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
2 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftQuery.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftVo.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOrderListItemBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/UserBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftQuery.java
View file @
4d353a0a
...
...
@@ -9,7 +9,7 @@ public class VoucherGiftQuery extends AbstractPagedQuery{
/**
*
*/
private
static
final
long
serialVersionUID
=
-
5874854787742050433L
;
private
static
final
long
serialVersionUID
=
5874854787742050433L
;
private
Integer
id
;
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftVo.java
View file @
4d353a0a
...
...
@@ -7,7 +7,7 @@ public class VoucherGiftVo implements Serializable{
/**
*
*/
private
static
final
long
serialVersionUID
=
1
L
;
private
static
final
long
serialVersionUID
=
2577358588222153067
L
;
/**
* 主键
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOrderListItemBean.java
View file @
4d353a0a
...
...
@@ -40,6 +40,7 @@ public class AbstractOrderListItemBean {
private
String
teeTime
;
private
Integer
isConfirm
;
private
BigDecimal
PrePayAmount
;
private
Integer
orderCategory
;
public
Integer
getOrderType
()
{
return
orderType
;
...
...
@@ -226,5 +227,13 @@ public class AbstractOrderListItemBean {
PrePayAmount
=
prePayAmount
;
}
public
Integer
getOrderCategory
()
{
return
orderCategory
;
}
public
void
setOrderCategory
(
Integer
orderCategory
)
{
this
.
orderCategory
=
orderCategory
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/UserBean.java
View file @
4d353a0a
...
...
@@ -316,6 +316,10 @@ public class UserBean implements Serializable {
*/
private
Integer
userWorkerId
;
/**
* 是否是销售 1 是 0 不是
*/
private
Integer
isSales
;
public
Integer
getUserWorkerId
()
{
return
userWorkerId
;
...
...
@@ -927,4 +931,12 @@ public class UserBean implements Serializable {
this
.
hobby
=
hobby
;
}
public
Integer
getIsSales
()
{
return
isSales
;
}
public
void
setIsSales
(
Integer
isSales
)
{
this
.
isSales
=
isSales
;
}
}
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