Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditRecordResultDTO.java

@@ -45,4 +45,9 @@ public class BadgeAuditRecordResultDTO implements Serializable {
 	 * 用户头像
 	 */
 	private String userAvatar;
+
+	/**
+	 * 审核记录ID
+	 */
+	private String recordId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/BadgeAuditingResultDTO.java

@@ -45,4 +45,9 @@ public class BadgeAuditingResultDTO implements Serializable {
 	 */
 	private String userAvatar;
 
+	/**
+	 * 徽章审核记录ID
+	 */
+	private String recordId;
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml

@@ -142,7 +142,8 @@
     </select>
     <select id="selectAuditingList" resultType="com.epmet.dto.result.BadgeAuditingResultDTO">
         SELECT
-            ubcr.ID AS "badgeId",
+            ubcr.ID AS recordId,
+            ubcr.badge_id AS "badgeId",
             badge.BADGE_NAME,
             badge.BADGE_ICON,
             ubcr.USER_ID,
@@ -176,7 +177,8 @@
     </select>
     <select id="selectAuditRecord" resultType="com.epmet.dto.result.BadgeAuditRecordResultDTO">
         SELECT
-            ubcr.ID AS "badgeId",
+            ubcr.ID AS recordId,
+            ubcr.badge_id AS "badgeId",
             badge.BADGE_NAME,
             badge.BADGE_ICON,
             ubcr.USER_ID,