fix conflict for merging code

js/index.js

@@ -64,7 +64,7 @@ jQuery(document).ready(function ($) {
                 console.log('updateWOStatus:' + val.target.value);
                 var url = "/work/ws/update";
                 var data = JSON.stringify({
-                    "woStatus": val.target.value,
+                    "userStatus": val.target.value,
                     "statusDisplay": "",
                     "userId": 1
                 });