From be47638f60bc2efbbe98b3debb854a5fcd4fc9b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期六, 03 十一月 2018 16:54:46 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/elecircle.content.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index 4ce250c..2d64550 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -467,7 +467,7 @@
id: 'title',
startX: 400,
startY: 40,
- name: '鐢垫睜缁勬诞鍏呯姸鎬佺數娴佹柟鍚�',
+ name: '璁惧娴厖鐘舵�佺數娴佹柟鍚�',
});
// 璁惧鍐呴儴娓╁害
@@ -487,7 +487,7 @@
[430, 520], [430, 360],[320,360]
],
clockwise: 0,
- name: '鐢垫睜缁勬诞鍏呯姸鎬佺數娴佹柟鍚�'
+ name: '璁惧娴厖鐘舵�佺數娴佹柟鍚�'
}
currentObj = $.extend({}, currentObj, floatCharge);
--
Gitblit v1.9.1