Merge remote-tracking branch 'origin/test'

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -58,7 +58,7 @@ public enum ResultCode  {
     AGENT_NEW_EMPTY(50041, "代理商不存在!"),
     SS_NO_COPY(50042, "深时场景暂不支持复制!"),
     AGENT_NOT_EMPTY(50043, "经销商名称已存在!"),
-    CAMERA_NOT_MOVE(50044, "场景在改相机中，无需迁移!"),
+    CAMERA_NOT_MOVE(50044, "场景在该相机中，无需迁移!"),
     SCENE_REBUILD_ERROR(50045, "场景重算失败。。。"),
     PASSWORD_ERROR_G(50046, "密码格式错误！"),
     AGENT_U_NOT_EMPTY(50047, "经销商账号已存在！"),