Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-08-31 cff0c053baeb229a6c7a7794c061c179111e0b7f

 src/main/java/com/zy/crm/common/model/SettleDto.java

@@ -189,6 +189,7 @@
                    dto.setUserId(user.getId());
                    dto.setUsername(user.getNickname());
                    dto.setMsg(user.getNickname()+"提交出差申请");
                    dto.setTime(DateUtils.convert(new Date()));
                    list.add(dto);
                    break;
                case 2: