Merge branch 'hotfix-1015-yuj'

src/main/webapp/resources/js/admin/controllers/checkMoney/exchangeRate.js

@@ -11,7 +11,7 @@ define(['app/app'], function(app) {
 		$scope.save = function() {
 			if ($scope.usdExchangeRate.fromCurrency == null || $scope.usdExchangeRate.fromCurrency == '') {
                 $scope.usdExchangeRate.fromCurrency = 'USD';
-                $scope.usdExchangeRate.toCurrency = 'CNY';
+                $scope.usdExchangeRate.toCurrency = 'RMB';
                 $scope.usdExchangeRate.type = 'USD';
 			}
 			exchangeRateService.save(null, $scope.usdExchangeRate, function(data) {

src/main/webapp/resources/view/admin/checkMoney/exchangerate.html

@@ -26,7 +26,7 @@
 					<span>=</span>
 					<div class="col-xs-5 input-group">
 						<input type="text" class="form-control" ng-disabled="!edit" ng-model="usdExchangeRate.rate" placeholder="汇率">
-						<div class="input-group-addon">CNY</div>
+						<div class="input-group-addon">RMB</div>
 					</div>
 				</div>
 				<div class="form-group col-xs-4 text-left">