Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy

zj

2024-07-15 2ed572d6b2a4be6b91b3e2a1ed48485abde91553

 src/main/java/com/nq/service/impl/UserServiceImpl.java

@@ -601,7 +601,7 @@
        userPositions = userPositionMapper.
                findMyPositionByCodeAndSpell(userId,
                        "","",
                        0, "IN");
                        0, "JP");


        List<UserPositionVO> userPositionVOS = Lists.newArrayList();