Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-data-cloud
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-data-cloud
Commits
4e376f6b
Commit
4e376f6b
authored
Sep 09, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' into 'master'
Developer See merge request
!55
parents
9ac82477
1b669aa2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
1 deletions
+2
-1
IndexDescDTO.java
...oud-api/src/main/java/com/gic/cloud/dto/IndexDescDTO.java
+1
-1
DataExplainQo.java
...oud-api/src/main/java/com/gic/cloud/qo/DataExplainQo.java
+0
-0
IndexQo.java
...ata-cloud-api/src/main/java/com/gic/cloud/qo/IndexQo.java
+0
-0
PageQo.java
...data-cloud-api/src/main/java/com/gic/cloud/qo/PageQo.java
+0
-0
UserQo.java
...data-cloud-api/src/main/java/com/gic/cloud/qo/UserQo.java
+0
-0
StoreSearchUtils.java
...n/java/com/gic/cloud/web/controller/StoreSearchUtils.java
+1
-0
No files found.
gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexDescDTO.java
View file @
4e376f6b
...
...
@@ -65,7 +65,7 @@ public class IndexDescDTO implements Serializable {
private
Integer
indexId
;
private
String
remark
;
private
Integer
seq
;
private
Integer
seq
=
0
;
public
Integer
getIndexDescId
()
{
return
indexDescId
;
...
...
gic-data-cloud-api/src/main/java/com/gic/cloud/qo/DataExplainQ
O
.java
→
gic-data-cloud-api/src/main/java/com/gic/cloud/qo/DataExplainQ
o
.java
View file @
4e376f6b
File moved
gic-data-cloud-api/src/main/java/com/gic/cloud/qo/IndexQ
O
.java
→
gic-data-cloud-api/src/main/java/com/gic/cloud/qo/IndexQ
o
.java
View file @
4e376f6b
File moved
gic-data-cloud-api/src/main/java/com/gic/cloud/qo/PageQ
O
.java
→
gic-data-cloud-api/src/main/java/com/gic/cloud/qo/PageQ
o
.java
View file @
4e376f6b
File moved
gic-data-cloud-api/src/main/java/com/gic/cloud/qo/UserQ
O
.java
→
gic-data-cloud-api/src/main/java/com/gic/cloud/qo/UserQ
o
.java
View file @
4e376f6b
File moved
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java
View file @
4e376f6b
...
...
@@ -95,6 +95,7 @@ public class StoreSearchUtils {
tempStoreIdList
=
this
.
storeWidgetApiService
.
listStoreInfoIdByStoreWidgetId
(
enterpriseId
,
tempStoreId
).
getResult
();
}
final
List
<
Integer
>
tempStoreIdListf
=
tempStoreIdList
;
log
.
info
(
"tempStoreIdList:{}"
,
JSON
.
toJSONString
(
tempStoreIdListf
));
if
(
StringUtils
.
isNotBlank
(
searchJson
)){
JSONObject
json
=
JSON
.
parseObject
(
searchJson
);
StoreSearchQo
storeSearchQo
=
json
.
getObject
(
StoreChannelEnum
.
OFFLINE
.
getChannel
().
toString
(),
StoreSearchQo
.
class
);
...
...
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