Merge remote-tracking branch 'origin/master'

# Conflicts:
#	blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java

@@ -178,14 +178,13 @@ public interface IErpDataProduceClient {
      * @return  结果
      */
     @GetMapping(TRAIL_ITEM_LIST)
-    R<List<Map<String, String>>> trialItemList(@RequestParam List<String> nameList);
+    R<List<Map<String, String>>> trialItemList(List<String> nameList);
 
     @GetMapping(CHECK_COMPLETE)
     R<Boolean> checkCompleteErpBackFill(@RequestParam(value = "woCode") String woCode, @RequestParam(value = "deliverKey", required = false) String deliverKey,
                                         @RequestParam(value = "workQty") Double workQty, @RequestParam(value = "unqualifiedQty") int unqualifiedQty,
                                         @RequestParam(value = "userName") String userName);
 
-
     /**
      * 入库单发送erp
      */
@@ -210,3 +209,6 @@ public interface IErpDataProduceClient {
                                         @RequestParam(value = "deliverKey", required = false) String deliverKey, @RequestParam(value = "testQty") Integer testQty,
                                         @RequestParam(value = "lossQty") Integer lossQty, @RequestParam(value = "scrapQty") Integer scrapQty);
 }
+
+
+}