Merge branch 'dev_layer0731' into 'develop'

修改

See merge request !308

project-order/src/main/java/com/dituhui/pea/order/controller/BusinessLayerController.java

@@ -27,7 +27,7 @@ public class BusinessLayerController {
 	@GetMapping("/business/layer/universal")
 	@GetMapping("/business/layer/universal")
 	public Result<?> businessLayerUniversal() {
 	public Result<?> businessLayerUniversal() {
 		// 通用图层
 		// 通用图层
-		Result res = null;
+		Result<?> res = null;
 		try {
 		try {
 			res = businessLayerService.businessLayerUniversal();
 			res = businessLayerService.businessLayerUniversal();
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
@@ -48,7 +48,7 @@ public class BusinessLayerController {
 	@GetMapping("/business/layer/custom/list")
 	@GetMapping("/business/layer/custom/list")
 	public Result<?> businessCustomLayers(String levelType, String levelValue, long page, long size) {
 	public Result<?> businessCustomLayers(String levelType, String levelValue, long page, long size) {
 		// 自定义图层列表
 		// 自定义图层列表
-		Result res = null;
+		Result<?> res = null;
 		try {
 		try {
 			res = businessLayerService.businessCustomLayers(levelType, levelValue, page, size);
 			res = businessLayerService.businessCustomLayers(levelType, levelValue, page, size);
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
@@ -65,7 +65,7 @@ public class BusinessLayerController {
 	 */
 	 */
 	@GetMapping("/business/layer/custom/detail")
 	@GetMapping("/business/layer/custom/detail")
 	public Result<?> businessCustomLayer(String layerId) {
 	public Result<?> businessCustomLayer(String layerId) {
-		Result res = null;
+		Result<?> res = null;
 		try {
 		try {
 			res = businessLayerService.businessCustomLayer(layerId);
 			res = businessLayerService.businessCustomLayer(layerId);
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
@@ -86,7 +86,7 @@ public class BusinessLayerController {
 	@PostMapping("/business/layer/custom/add")
 	@PostMapping("/business/layer/custom/add")
 	public Result<?> businessCustomLayerAdd(@RequestBody BusinessCustomLayerAddReqDTO reqDTO) {
 	public Result<?> businessCustomLayerAdd(@RequestBody BusinessCustomLayerAddReqDTO reqDTO) {
 		// 自定义图层新增
 		// 自定义图层新增
-		Result res = null;
+		Result<?> res = null;
 		try {
 		try {
 			res = businessLayerService.businessCustomLayerAdd(
 			res = businessLayerService.businessCustomLayerAdd(
 					reqDTO.getBranchId(), reqDTO.getLayerName(), reqDTO.getLayerDesc(), reqDTO.getSkills());
 					reqDTO.getBranchId(), reqDTO.getLayerName(), reqDTO.getLayerDesc(), reqDTO.getSkills());
@@ -107,7 +107,7 @@ public class BusinessLayerController {
 	@PostMapping("/business/layer/custom/update")
 	@PostMapping("/business/layer/custom/update")
 	public Result<?> businessCustomLayerUpdate(@RequestBody BusinessCustomLayerUpdateReqDTO reqDTO) {
 	public Result<?> businessCustomLayerUpdate(@RequestBody BusinessCustomLayerUpdateReqDTO reqDTO) {
 		// 自定义图层修改
 		// 自定义图层修改
-		Result res = null;
+		Result<?> res = null;
 		try {
 		try {
 			res = businessLayerService.businessCustomLayerUpdate(reqDTO.getLayerId(), reqDTO.getLayerDesc(), reqDTO.getSkills());
 			res = businessLayerService.businessCustomLayerUpdate(reqDTO.getLayerId(), reqDTO.getLayerDesc(), reqDTO.getSkills());
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
@@ -125,7 +125,7 @@ public class BusinessLayerController {
 	@GetMapping("/business/layer/custom/remove")
 	@GetMapping("/business/layer/custom/remove")
 	public Result<?> businessCustomLayerRemove(String layerId) {
 	public Result<?> businessCustomLayerRemove(String layerId) {
 		// 自定义图层删除
 		// 自定义图层删除
-		Result res = null;
+		Result<?> res = null;
 		try {
 		try {
 			res = businessLayerService.businessCustomLayerRemove(layerId);
 			res = businessLayerService.businessCustomLayerRemove(layerId);
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {