rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/bug-528' into develop

This commit is contained in:
曹鹏飞 2025-08-06 13:58:43 +08:00
parent 26e7ea8fab a81d362c96
commit ac59042d1a
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
View File

@ -639,6 +639,7 @@ public class TicketController extends ControllerBase {
.setAccidentLevel(ticket.getAccidentLevel()) .setAccidentLevel(ticket.getAccidentLevel())
.setUserIsHandle(handleIds.contains(AdminUserUtil.getUserId())) .setUserIsHandle(handleIds.contains(AdminUserUtil.getUserId()))
.setUserIsCQM(cqms.contains(AdminUserUtil.getUserId())) .setUserIsCQM(cqms.contains(AdminUserUtil.getUserId()))
.setUserPlatform(ticket.getUserPlatform())
.setEvaluate(getTicketEvaluate(ticket.getId())); .setEvaluate(getTicketEvaluate(ticket.getId()));
return ApiResult.success(vo); return ApiResult.success(vo);
} }

5
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java
View File

@ -32,6 +32,11 @@ public class TicketInfoVO {
//创建人头像 //创建人头像
private String createUserAvatar; private String createUserAvatar;
/**
* 用户来源平台，app或者admin
*/
private String userPlatform;
//提交时间 //提交时间
private LocalDateTime createTime; private LocalDateTime createTime;

3
pom.xml
View File

@ -24,9 +24,10 @@
<module>nflg-mobilebroken-product</module> <module>nflg-mobilebroken-product</module>
</modules> </modules>
<properties> <properties>
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<java.version>11</java.version>
<spring-boot.version>2.3.12.RELEASE</spring-boot.version> <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
<spring-cloud.version>Hoxton.SR8</spring-cloud.version> <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
<spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version> <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>