Merge branch 'test'

public/resource/template/adjustment_template_tpl.html

@@ -30,7 +30,7 @@
         <td>
         	<a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
         	<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
-            [% if(check_auth('index/adjustment')) { %]
+            [% if(check_auth('index/delAdjustment')) { %]
             <a class="btn1 btn-success list_delete" href="#modal-delete" data-toggle="modal" data-id='[%= it[item]["id"]%]'>撤销调整</a>
         	[% } %]