Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
40f8368d
Commit
40f8368d
authored
Jan 18, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4
parents
2674d435
e1428ff5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
CustomerBusinessContoller.java
...1/yifu/archives/controller/CustomerBusinessContoller.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/CustomerBusinessContoller.java
View file @
40f8368d
...
...
@@ -250,7 +250,7 @@ public class CustomerBusinessContoller {
return new R(tSettleDomainService.getPage(page, vo));
}else{
}*/
return
new
R
(
tSettleDomainService
.
getOwnSettleDomain
(
page
,
user
.
getId
().
toString
(),
vo
.
getDepartName
()
));
return
tSettleDomainService
.
getOwnSettleDomain
(
page
,
user
.
getId
(),
vo
.
getDepartName
(
));
}
/**
...
...
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