Merge branch 'dev_personal_center' into dev_temp

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -29,10 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -124,7 +121,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 }
             });
         });
-        return userOperListResultDTOS;
+        return userOperListResultDTOS.stream().sorted(Comparator.comparing(UserOperListResultDTO::getBadgeName)).collect(Collectors.toList());
     }
 
     /**

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.9__alter_useradvice_content.sql

@@ -0,0 +1,9 @@
+ALTER TABLE `user_advice` DROP COLUMN `ADVICE_CONTENT`;
+
+ALTER TABLE `user_advice`
+ADD COLUMN `ADVICE_CONTENT`  varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  COMMENT '建议内容' NOT NULL AFTER `REG_PHONE`;
+
+ALTER TABLE `user_advice` DROP COLUMN `GOV_CONTENT`;
+
+ALTER TABLE `user_advice`
+ADD COLUMN `GOV_CONTENT`  varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  COMMENT '建议回复内容' NULL AFTER `REPLY_TIME`;