Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -447,8 +447,8 @@ public class C {
         public static final String IS_NULL_INFO = "参数错误";
         public static final String IS_ERR_INFO = "参数错误";
         public static final String OPERATION_ERR_INFO = "操作失败";
-        public static final String SERVER_ERR_INFO = "服务器异常，请稍后重试";
-        public static final String SERVER_SQL_ERR_INFO = "服务器异常，请检查数据后重试";
+        public static final String SERVER_ERR_INFO = "网络异常，请稍后重试";
+        public static final String SERVER_SQL_ERR_INFO = "网络异常，请检查数据后重试";
         public static final String LOGIN_CAN_NOT_ERR_INFO = "用户已被锁定或已注销";
     }