merge conflict

src/main/ui/static/risk/templates/risk_detail.html

@@ -4,7 +4,7 @@
         <ol class="breadcrumb">
             <li><i class="fa fa-gift"></i> Risk</li>
             <li class="fa fa-gift">Risk Manager</li>
-            <li class="active">Risk Detail</li>
+            <li class="active">Handling Detail</li>
         </ol>
     </section>
     <section class="content">
@@ -16,22 +16,22 @@
                 <a ui-sref="analysis_monitoring.risk_history({'record_id':record.id})">Risk history</a>
             </li>
             <li ui-sref-active="active">
-                <a ui-sref="analysis_monitoring.risk_detail({'record_id':record.id})">Risk Detail</a>
+                <a ui-sref="analysis_monitoring.risk_detail({'record_id':record.id})">Handling Detail</a>
             </li>
         </ul>
         <div class="box box-default">
-            <div class="box-header">Risk Details</div>
+            <div class="box-header">Handling Details</div>
             <div class="box-header" ng-if="record.status==0" style="text-align: right;">
-                <button type="button" class="btn btn-info"  ng-click="addRemark()">Add Remark</button>
+                <button type="button" class="btn btn-info"  ng-click="addRemark()">Handle</button>
-                <button type="button" class="btn btn-info"  ng-click="dealDirectly()">Close record</button>
+                <button type="button" class="btn btn-info"  ng-click="dealDirectly()">Close Risk</button>
             </div>
             <div class="box-body table-responsive">
                 <table class="table table-hover">
                     <thead>
                     <tr>
-                        <th>Create Time</th>
+                        <th>Handle Time</th>
-                        <th>auditor</th>
+                        <th>Operator</th>
-                        <th>remark</th>
+                        <th>Detail</th>
                     </tr>
                     </thead>
                     <tbody>

src/main/ui/static/risk/templates/risk_history.html

@@ -17,7 +17,7 @@
                     <a ui-sref="analysis_monitoring.risk_history({'record_id':record.id})">Risk history</a>
                 </li>
                 <li ui-sref-active="active">
-                    <a ui-sref="analysis_monitoring.risk_detail({'record_id':record.id})">Risk Detail</a>
+                    <a ui-sref="analysis_monitoring.risk_detail({'record_id':record.id})">Handling Detail</a>
                 </li>
             </ul>
         </ul>

src/main/ui/static/risk/templates/risk_orders.html

@@ -17,7 +17,7 @@
                     <a ui-sref="analysis_monitoring.risk_history({'record_id':record.id})">Risk history</a>
                 </li>
                 <li ui-sref-active="active">
-                    <a ui-sref="analysis_monitoring.risk_detail({'record_id':record.id})">Risk Detail</a>
+                    <a ui-sref="analysis_monitoring.risk_detail({'record_id':record.id})">Handling Detail</a>
                 </li>
             </ul>
         </ul>

src/main/ui/static/risk/templates/risk_remark.html

@@ -1,5 +1,5 @@
 <section class="content-header">
-    <h1>Add Remark</h1>
+    <h1>Handle Detail</h1>
 </section>
 
 <div class="content">
@@ -10,7 +10,7 @@
                     <div class="box-header">
                         <form role="form" style="margin:0px auto;width: 50%">
                             <div class="form-group">
-                                <label>remark</label>
+                                <label>Detail</label>
                                 <input ng-model="addRemarkParams.remark"  name="code" class="form-control" type="text"/>
                             </div>
                             <div class="form-group">