Merge branch 'dev_epmet_mix' into release

tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectResultServiceImpl.java

@@ -111,7 +111,8 @@ public class UserProjectResultServiceImpl extends ServiceImpl<UserProjectResultM
             re.setClientType(s.getClientType());
             re.setRealName(s.getRealName());
             re.setOrgId(s.getOrgId());
-            re.setOrgName(("resi".equals(s.getOrgName()) ? "居民端" : ("gov".equals(s.getOrgName()) ? "工作端" : s.getOrgName())));
+            re.setOrgName(s.getOrgName());
+            re.setOrgType(("resi".equals(s.getOrgType()) ? "居民端" : ("gov".equals(s.getOrgType()) ? "工作端" : s.getOrgType())));
             re.setOrgType(s.getOrgType());
         }));
         page.setRecords(resultEntity);