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
0b12ab9b
Commit
0b12ab9b
authored
Mar 01, 2024
by
KeYong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop_dl' of
http://36.40.66.175:5000//moa/amos-boot-biz
into develop_dl
parents
148c442d
129f6327
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
EquipmentSpecificMapper.xml
...uip/src/main/resources/mapper/EquipmentSpecificMapper.xml
+1
-1
No files found.
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @
0b12ab9b
...
...
@@ -2672,7 +2672,7 @@
</if>
AND wed.equipment_name is not null
</where>
ORDER BY CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC
ORDER BY CONVERT(bizOrgName USING gbk) ASC, equipStatus DESC
, wes.create_date DESC
</select>
<select
id=
"getMonitoringCount"
resultType=
"java.util.Map"
>
SELECT
...
...
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