Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
de4a43ab
Commit
de4a43ab
authored
Sep 23, 2021
by
chenhao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'chenhao' into developer
parents
486062e5
9fa4a660
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
PowerTransferServiceImpl.java
...module/jcs/biz/service/impl/PowerTransferServiceImpl.java
+2
-2
jcs-1.0.0.0.xml
...ystem-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
+0
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @
de4a43ab
...
...
@@ -218,8 +218,8 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
}
// 3.消防队伍-监控大队
List
<
FireBrigadeResourceDto
>
monitorFireBrigadeList
=
fireTeamService
.
listMonitorFireBrigade
(
FireBrigadeTypeEnum
.
监控大队
.
getCode
());
//
List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade();
//
List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.监控大队.getCode());
List
<
FireBrigadeResourceDto
>
monitorFireBrigadeList
=
fireTeamService
.
listMonitorFireBrigade
();
/*bug 2403 队伍未显示图片 2021-09-23 陈召开始 */
for
(
FireBrigadeResourceDto
fireBrigadeResourceDto
:
monitorFireBrigadeList
)
{
if
(
fireBrigadeResourceDto
.
getPic
()
!=
null
)
{
...
...
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @
de4a43ab
This diff is collapsed.
Click to expand it.
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