Merge branch 'dev' into 'master'

save

See merge request liangkaiping/wmypcweb!1

src/locales/newWord.json

@@ -86,7 +86,7 @@
         "mylabiliry103": "评分说明",
         "mylabiliry103": "评分说明",
         "ViewMore": "查看项目",
         "ViewMore": "查看项目",
         "pictureBestSize03": "支持",
         "pictureBestSize03": "支持",
-        "PoweredByCompanyName": "上海易知信息科技股份有限公司提供技术支持",
+        "PoweredByCompanyName": "上海复深蓝软件股份有限公司提供技术支持",
         "pictureBestSize04": "大小",
         "pictureBestSize04": "大小",
         "ApplyNotice": "报名须知",
         "ApplyNotice": "报名须知",
         "pictureBestSize02": "比例为",
         "pictureBestSize02": "比例为",

src/locales/zh-CN.json

@@ -26,7 +26,7 @@
 	"PleaseInputSmsCode": "请输入验证码",
 	"PleaseInputSmsCode": "请输入验证码",
 	"confirm.pwd.not.correct": "两次输入的密码不一致",
 	"confirm.pwd.not.correct": "两次输入的密码不一致",
 	"8-20CharactersIncludingNumbersAndLetters": "8-20个字符,由字母、数字和符号组合",
 	"8-20CharactersIncludingNumbersAndLetters": "8-20个字符,由字母、数字和符号组合",
-	"PoweredByShanghaiYizhiTechnologyCo.,Ltd.": "上海易知信息科技股份有限公司提供技术支持",
+	"PoweredByShanghaiYizhiTechnologyCo.,Ltd.": "上海复深蓝软件股份有限公司提供技术支持",
 	"Home": "首页",
 	"Home": "首页",
 	"Course": "课程",
 	"Course": "课程",
 	"MyStudy": "我的学习",
 	"MyStudy": "我的学习",
@@ -392,7 +392,7 @@
 	"WrongCaptchaCode": "校验码输入不正确",
 	"WrongCaptchaCode": "校验码输入不正确",
 	"WorngSmsCode": "验证码输入不正确",
 	"WorngSmsCode": "验证码输入不正确",
 	"TwoInputPasswordsMustBeConsistent": "两次输入的密码不一致",
 	"TwoInputPasswordsMustBeConsistent": "两次输入的密码不一致",
-	"PoweredByCompanyName": "版权所有 ©上海易知信息科技股份有限公司",
+	"PoweredByCompanyName": "版权所有 ©上海复深蓝软件股份有限公司",
 	"ToSearch1": "搜索",
 	"ToSearch1": "搜索",
 	"ToSearch2": ">>",
 	"ToSearch2": ">>",
 	"Photo": "头像",
 	"Photo": "头像",