Merge pull request '添加保底话术' (#15) from dev into test

Reviewed-on: http://39.105.23.186:3000/develop/digimeta-MultiSaas/pulls/15

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/digitalmans/domain/vo/DmReceptionVo.java

@@ -14,6 +14,8 @@ public class DmReceptionVo {
     private String name;
 
     private String date;
+    
+    private String welcome;
 
     private Long[] guide;
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/service/impl/DmReceptionServiceImpl.java

@@ -102,6 +102,7 @@ public class DmReceptionServiceImpl extends BaseServiceImpl<DmReceptionQuery, Dm
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM-dd");
         SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd");
         vo.setDate(dateFormat.format(dto.getReceptionTime()));
+        vo.setWelcome(dto.getWelcome());
         vo.setGuide(new Long[]{dto.getHeadId()});
         List<DmReceptionVisitorMerge> rvList = baseManager.selectDeceptionVisitorMerge(dto.getId());
         Long[][] visitorIds = new Long[3][5];