Merge branch 'dev' into test

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -60,7 +60,7 @@ public interface IDistributionParcelListClient {
 	@PostMapping(API_PREFIX+"/add")
 	boolean add(@RequestBody DistributionParcelListEntity entity);
 
-	@PostMapping(API_PREFIX+"/submitNumByOrderIdAndName")
+	@GetMapping(API_PREFIX+"/submitNumByOrderIdAndName")
-	boolean submitNumByOrderIdAndName(Long articleId, String productName, Integer num);
+	boolean submitNumByOrderIdAndName(@RequestParam Long articleId, @RequestParam String productName, @RequestParam Integer num);
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -75,7 +75,7 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	}
 
 	@Override
-	@PostMapping(API_PREFIX+"/submitNumByOrderIdAndName")
+	@GetMapping(API_PREFIX+"/submitNumByOrderIdAndName")
 	public boolean submitNumByOrderIdAndName(Long articleId, String productName, Integer num) {
 		return distributionParcelListService.submitNumByOrderIdAndName(articleId,productName,num);
 	}