Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-store
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-store
Commits
945e55ac
Commit
945e55ac
authored
Dec 05, 2019
by
陶光胜
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://115.159.76.241/base_platform_enterprise/gic-store
into developer
parents
93d4026c
d117b9b9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
2 deletions
+1
-2
StoreFieldApiServiceImpl.java
...ic/store/service/outer/impl/StoreFieldApiServiceImpl.java
+1
-2
No files found.
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreFieldApiServiceImpl.java
View file @
945e55ac
...
...
@@ -330,8 +330,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
List
<
Integer
>
regionIdList
=
storeRegionService
.
listStoreRegion
(
enterpriseId
);
//根据域查询字段ID list
List
<
Integer
>
storeFieldIdList
=
storeFieldRegionRelService
.
listStoreFieldId
(
regionIdList
);
return
ServiceResponse
.
success
(
EntityUtil
.
changeEntityListNew
(
StoreFieldDTO
.
class
,
storeFieldService
.
listStoreField
(
enterpriseId
,
search
,
storeFieldIdList
)));
return
ServiceResponse
.
success
(
storeFieldService
.
listStoreField
(
enterpriseId
,
search
,
storeFieldIdList
));
}
@Override
...
...
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