Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
jenkins
order-group
Commits
adc34c69
Commit
adc34c69
authored
Dec 30, 2019
by
胡超
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature_20191226_1.9.9_sessionkey' into develop
# Conflicts: # assortment-ordercenter-sdk/pom.xml
parents
28fbe315
91a608e6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
assortment-ordercenter-sdk/pom.xml
+2
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/OrderExtInfoDTO.java
+5
-0
No files found.
assortment-ordercenter-sdk/pom.xml
View file @
adc34c69
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
1.
1.1
-SNAPSHOT
</version>
<version>
1.
0.9
-SNAPSHOT
</version>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
<artifactId>
ordercenter-sdk
</artifactId>
<artifactId>
ordercenter-sdk
</artifactId>
<version>
1.1.
1-SNAPSHOT
</version>
<version>
1.1.
0.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/OrderExtInfoDTO.java
View file @
adc34c69
...
@@ -73,4 +73,9 @@ public class OrderExtInfoDTO {
...
@@ -73,4 +73,9 @@ public class OrderExtInfoDTO {
private
String
memberLevel
;
private
String
memberLevel
;
private
boolean
paidMember
;
private
boolean
paidMember
;
/**
* 异常补退使用
*/
private
String
sessionKey
;
}
}
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