Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java

@@ -122,6 +122,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                   t1.welfareUnitName,
                   GROUP_CONCAT(DISTINCT t3.optionName,'（',t2.selectNum,'份）') AS selectedOptions,
                   GROUP_CONCAT(DISTINCT t2.mobile) AS mobile,
+                  GROUP_CONCAT(DISTINCT t2.userName) AS userName2,
                   GROUP_CONCAT(DISTINCT t2.receiveAddress) AS receiveAddress,
                   t4.username AS userName,
                   t4.loginname AS loginName,
@@ -182,6 +183,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
         entities.add(new ExcelExportEntity("所属单位", "welfareUnitName", 20));
         entities.add(new ExcelExportEntity("所属工会", "welfareUnionName", 20));
         entities.add(new ExcelExportEntity("所选福利", "selectedOptions", 20));
+        entities.add(new ExcelExportEntity("收货人", "userName2", 20));
         entities.add(new ExcelExportEntity("联系电话", "mobile", 20));
 
         if(project.getProvideMode() == 3){