Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-09 a04797899856a822c792530d0d65e88b3622ddd7

 pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVoMapper.java

@@ -15,7 +15,8 @@
     * @param po
     * @return
     */
    @Mapping(target = "name", source = "name")
    @Mapping(target = "id", source = "userId")
    @Mapping(target = "name", source = "userName")
    @Mapping(target = "phone", source = "phone")
    @Mapping(target = "token", ignore=true)
    UserVo po2vo(BaUser po);