Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_platform

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

@@ -7,6 +7,9 @@ package com.epmet.commons.tools.exception;
  */
 public enum EpmetErrorCode {
 
+	/**
+	 * 错误code及消息
+	 */
 	ERR10002( 10002,"数据库中已存在该记录"),
 	/**
 	 * 账号或密码错误ACCOUNT_NOT_EXIST
@@ -227,7 +230,7 @@ public enum EpmetErrorCode {
 
 	//通用错误码 start
 	//通用的 错误消息自己定义返回
-	OPERATION_FAILED(9999,"网络开小差..."),
+	EPMET_COMMON_OPERATION_FAIL(9999,"网络开小差..."),
 	//通用错误码 end
 	;