合并冲突

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -237,9 +237,11 @@ public class BasicBussinessTypeController extends BaseController {
         List<BasicBussinessTypeResponse> bussinessTypeResponses = new ArrayList<>();
         if (detailType.equals("norDetail")) {
         } else if (detailType.equals("preDetail")) {
-            bussinessTypeRequest.setCode(Constant.INV_PRE_CODE);
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInv();
+            bussinessTypeRequest.setCode(invWarehouseEntity.getCode());
         } else if (detailType.equals("preInDetail")) {
-            bussinessTypeRequest.setCode(Constant.INV_PRE_IN_CODE);
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInInv();
+            bussinessTypeRequest.setCode(invWarehouseEntity.getCode());
         }
         bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(bussinessTypeRequest);
         List<DictDto> reList = bussinessTypeResponses.stream().map(s-> {