Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer

Conflicts: haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

Merge remote-tracking branch 'origin/master_xgh_停用功能' into developer
Conflicts: haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
690a6cd9 · 徐高华 · f2f7c026 · ed3211ef · 690a6cd9
Commit 690a6cd9 authored Jul 13, 2022 by 徐高华
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

TabHaobanStaffClerkRelationMapper.xml ...in/resources/mapper/TabHaobanStaffClerkRelationMapper.xml +0 -2

No files found.
--- a/haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
+++ b/haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
@@ -540,5 +540,4 @@
            #{id,jdbcType=VARCHAR}
        </foreach>
    </select>
-
 </mapper>
\ No newline at end of file