Skip to content

C
cloud-platform
Commit 16a7c29c authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'master-tiande' into dev-tiande

parents 3615d25f 4e862694
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @ 16a7c29c
...@@ -776,11 +776,11 @@ ...@@ -776,11 +776,11 @@
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc3.id in or bc3.id in
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc4.id in or bc4.id in
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
...@@ -792,11 +792,11 @@ ...@@ -792,11 +792,11 @@
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc3.company_id in or bc3.company_id in
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc4.company_id in or bc4.company_id in
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
...@@ -919,11 +919,11 @@ ...@@ -919,11 +919,11 @@
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc3.id in or bc3.id in
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc4.id in or bc4.id in
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
...@@ -935,11 +935,11 @@ ...@@ -935,11 +935,11 @@
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc3.company_id in or bc3.company_id in
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc4.company_id in or bc4.company_id in
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
...@@ -987,11 +987,11 @@ ...@@ -987,11 +987,11 @@
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc3.id in or bc3.id in
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc4.id in or bc4.id in
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
...@@ -1003,11 +1003,11 @@ ...@@ -1003,11 +1003,11 @@
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc3.company_id in or bc3.company_id in
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc4.company_id in or bc4.company_id in
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
......
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleWarningMsgMapper.xml
View file @ 16a7c29c
...@@ -83,11 +83,11 @@ ...@@ -83,11 +83,11 @@
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc3.id in or bc3.id in
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc4.id in or bc4.id in
<foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCompanyIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
...@@ -99,11 +99,11 @@ ...@@ -99,11 +99,11 @@
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc3.company_id in or bc3.company_id in
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
or bc4.company_id in or bc4.company_id in
<foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")"> <foreach collection="dataCorporationIds" item="item" separator="," open="(" close=")">
#{item} #{item}
</foreach> </foreach>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment