Merge branch 'pre-production'

blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java

@@ -32,6 +32,8 @@ public class OldSystemDataPushConfig {
 		warehourseIds.add("69");
 		// 绵阳
 		warehourseIds.add("123");
+		// 武汉
+		warehourseIds.add("48");
 	}
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java

@@ -211,7 +211,7 @@ public class BasicdataGoodsAllocationController extends BladeController {
 	/**
 	 * 货位获取模板信息
 	 */
-	@PostMapping("/getPrintTemplate")
+	@GetMapping("/getPrintTemplate")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "生成模板图片返回前端渲染", notes = "传入模板参数")
 	public R<?> getPrintTemplate(@ApiIgnore @RequestParam("ids") String ids) {