Merge branch 'feature/1007023' into 'master'

feat: [1007023] 从erp跳到编辑端少了几个入口的埋点，而且账号密码不能返回在接口里面

See merge request rays/pcloud-book!1549

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java

@@ -1134,7 +1134,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 				if(adviserId != null && MapUtils.isNotEmpty(userLoginInfoMap) && userLoginInfoMap.containsKey(adviserId)) {
 					UserLogin userLogin = userLoginInfoMap.get(adviserId);
 					bookVO.setAdviserAccount(userLogin!=null ? userLogin.getUserName() :null);
-					bookVO.setAdviserPwd(userLogin!=null ? userLogin.getCurrentPassword() :null);
+					bookVO.setEncryptInfo(userLogin!=null ? userLogin.getEncryptInfo() :null);
 				}
 				if(adviserId != null && MapUtils.isNotEmpty(adviserAgentMap) && adviserAgentMap.containsKey(adviserId)) {
 					AdviserBaseInfoDto adviserBaseInfoDto = adviserAgentMap.get(adviserId);

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/ErpAdviserBookVO.java

@@ -65,4 +65,6 @@ public class ErpAdviserBookVO implements Serializable {
     private int xiaoRuiEducation;
     private int chScanCount;
 
+    private String encryptInfo;
+
 }