Merge branch 'feature/bug-528' into develop

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

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

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

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

pom.xml

@@ -24,9 +24,10 @@
         <module>nflg-mobilebroken-product</module>
     </modules>
     <properties>
-        <java.version>11</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <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-cloud.version>Hoxton.SR8</spring-cloud.version>
         <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>