You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
pref_mail@163.com
0b9592de60
Merge remote-tracking branch 'remotes/origin/dev-warehouse' into dev
# Conflicts:
# blade-biz-common/src/main/java/org/springblade/common/constant/CommonConstant.java
# blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java
# blade-biz-common/src/main/java/org/springblade/common/utils/TemplateUtil.java
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTrayEntity.java
# blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/WarehouseParcelListEntity.java
# blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseParcelListEntity.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseParcelListcopyEntity.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseParcelListClient.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseRetentionRecordClient.java
# blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListCopyVO.java
# blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java
# blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java
# blade-service/logpm-basicdata/pom.xml
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTrayService.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java
# blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
# blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseRetentionRecordController.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleCopyDTO.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseRetentionRecordClient.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionRecordService.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
# blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseRetentionRecordWrapper.java
合并代码
|
1 year ago |
.. |
src/main/java/com/logpm/basic
|
Merge remote-tracking branch 'remotes/origin/dev-warehouse' into dev
|
1 year ago |
pom.xml
|
基础数据Pda
|
2 years ago |