Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsShelfDTO.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.xml
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
|