Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java
#	mes/qd/src/views/wms/old_manage/old_package/index.vue

mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/produceWorkorder/create',
+    url: 'api/produceWorkorder',
     method: 'post',
     data
   })