Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas into zzd

resources/views/order/wave/search.blade.php

@@ -122,7 +122,6 @@
                     {name: 'start_time', type: 'dataTime', tip: '选择显示指定日期的起始时间', placeholder: ''},
                     {name: 'end_time', type: 'dataTime', tip: '选择显示指定日期的结束时间', placeholder: ''},
                     {name: 'wave_num', type: 'input', tip: '波次编号：如模糊搜索需要在条件前后输入%号，回车提交', placeholder: ''},
-                    // {name:'wave_status',type:'select',tip:'',placeholder:'',data:[]},
                 ]];
                 this.form = new query({
                     el: '#form_div',