Merge remote-tracking branch 'origin/develop' into develop

src/main/ui/static/analysis/monitoring/templates/analysis_monitoring.html

@@ -19,7 +19,7 @@
             <li ui-sref-active-eq="active" ng-if="('monitor'|withModule)&&(currentUser.org_id==null)">
                 <a ui-sref="analysis_monitoring.pre_refund"><i class="fa fa-tv"></i> <span>欠款|Pre Refund</span></a>
             </li>
-            <li ui-sref-active-eq="active" ng-if="('monitor'|withModule)&&(currentUser.org_id==null)">
+            <li ui-sref-active-eq="active" ng-if="('RiskManagement'|withModule)&&(currentUser.org_id==null)">
                 <a ui-sref="analysis_monitoring.risk_manager"><i class="fa fa-tv"></i> <span>风控记录|Risk Records</span></a>
             </li>
 

src/main/ui/static/payment/partner/simple-apply.js

@@ -8,7 +8,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
             controller: 'simpleApplicationListCtrl',
             data: {label: '商户自主申请列表'}
         }).state('partner_apply.apply_detail', {
-            url: '/{client_pre_apply_id}/detail',
+            url: '/{client_pre_apply_id}/apply/detail',
             templateUrl: '/static/payment/partner/templates/simple_application_detail.html',
             controller: 'simpleApplicationDetailCtrl',
             resolve: {