Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -108,7 +108,7 @@ public enum EpmetErrorCode {
     OPER_EXTERNAL_APP_EXISTS(8711, "应用已存在"),
     OPER_CUSTOMER_FOOTBAR_EXISTS(8712, "footbar已存在"),
     OPER_CUSTOMER_FOOTBAR_NOT_FOUND(8713, "footbar不存在"),
-    OPER_EXT_APP_SECRET_RESET_FAIL(8712, "秘钥更新失败"),
+    OPER_EXT_APP_SECRET_RESET_FAIL(8713, "秘钥更新失败"),
 
 	// 党建声音 前端提示 88段
 	DRAFT_CONTENT_IS_NULL(8801, "至少需要添加一个段落"),