Merge branch 'master' of http://gitlab.yidianling.com/xueyuanyuan/work-order-system

# Conflicts:
#	woDetail.html

js/index.js

@@ -10,7 +10,7 @@ jQuery(document).ready(function ($) {
             woDetail: function (wo) {
                 console.log(wo.id);
                 // 获取工单详情
-                window.location.href="/woDetail.html?wo.id=" + wo.id;
+                window.location.href="/woDetail.html?id=" + wo.id;
             }
 
         }