Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
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
3ec0d3af
authored
Apr 27, 2022
by
caosy
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'f-6.7.2.5' and 'f-6.7.2.5' of 192.168.10.6:caosy/fun-admin into f-6.7.2.5
parents
0ec13a5c
c38951c3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
0 deletions
src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java
src/main/java/com/ctrip/fun/admin/controller/basic/VoucherRuleController.java
View file @
3ec0d3af
...
...
@@ -507,6 +507,19 @@ public class VoucherRuleController {
nameIdBean3
.
setName
(
VoucherTypeEnum
.
TOUR
.
getMsg
());
nameIdBean3
.
setId
(
VoucherTypeEnum
.
TOUR
.
getValue
());
result
.
add
(
nameIdBean3
);
NameIdBean
<
Integer
>
nameIdBean4
=
new
NameIdBean
<
Integer
>();
nameIdBean4
.
setName
(
VoucherTypeEnum
.
TOUR_VOUCHER
.
getMsg
());
nameIdBean4
.
setId
(
VoucherTypeEnum
.
TOUR_VOUCHER
.
getValue
());
result
.
add
(
nameIdBean4
);
NameIdBean
<
Integer
>
nameIdBean5
=
new
NameIdBean
<
Integer
>();
nameIdBean5
.
setName
(
VoucherTypeEnum
.
TRAIN_VOUCHER
.
getMsg
());
nameIdBean5
.
setId
(
VoucherTypeEnum
.
TRAIN_VOUCHER
.
getValue
());
result
.
add
(
nameIdBean5
);
NameIdBean
<
Integer
>
nameIdBean6
=
new
NameIdBean
<
Integer
>();
nameIdBean6
.
setName
(
VoucherTypeEnum
.
VIP_VOUCHER
.
getMsg
());
nameIdBean6
.
setId
(
VoucherTypeEnum
.
VIP_VOUCHER
.
getValue
());
result
.
add
(
nameIdBean6
);
return
result
;
}
...
...
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