Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

         QueryWrapper<TaUser> taUserQueryWrapper =new QueryWrapper<>();
         taUserQueryWrapper.eq("org_id",orgId);
         taUserQueryWrapper.ne("user_id",userID);
+        taUserQueryWrapper.eq("type","prop");
         ticketVO.setTpUsersList(taUserMapper.selectList(taUserQueryWrapper));
         /*本人*/
         ticketVO.setCurrentUserName(userID.toString());