diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index f84a048b6..70d3ca31d 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -117,7 +117,7 @@ http://127.0.0.1:9068 lb://epdc-demo-server - http://127.0.0.1:9064 + http://127.0.0.1:9063 lb://epdc-websocket-server diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/GroupDetailForMobileEndResultDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/GroupDetailForMobileEndResultDTO.java index 8bed92e8e..7e76a18ff 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/GroupDetailForMobileEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/GroupDetailForMobileEndResultDTO.java @@ -30,6 +30,11 @@ public class GroupDetailForMobileEndResultDTO implements Serializable { */ private String groupAvatar; + /** + * 社群介绍 + */ + private String groupIntroduction; + /** * 群主 */ diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml index b34bada6e..6c28ba9e7 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml @@ -108,7 +108,7 @@ dev - 9064 + 9063 2 47.104.224.45 @@ -131,7 +131,7 @@ test - 9064 + 9063 2 47.104.224.45 @@ -154,7 +154,7 @@ prod - 9064 + 9063 8 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml index 8e6021827..a11dc1b88 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml @@ -95,7 +95,7 @@ WHERE gp.DEL_FLAG = '0' AND gp.GRID_ID = #{gridId} - = ]]> 20 + ]]> 20 GROUP BY gp.ID ORDER BY @@ -127,7 +127,7 @@ GROUP BY gp.ID ORDER BY - latestTopicTime DESC + MAX( tp.CREATED_TIME ) DESC - SELECT ID, GROUP_ID,