Merge remote-tracking branch 'origin/oasis' into oasis

src/main/java/com/izouma/nineth/service/CompanyCollectionService.java

@@ -126,6 +126,7 @@ public class CompanyCollectionService {
             oasisDistrictCollectionDTO.setOasisId(asset.getOasisId());
             oasisDistrictCollectionDTO.setCollectionName(asset.getName());
             oasisDistrictCollectionDTO.setOriginPrice(asset.getPrice());
+            oasisDistrictCollectionDTO.setSellPrice(asset.getSellPrice());
             oasisDistrictCollectionDTO.setScanOnly(false);
             oasisDistrictCollectionDTO.setOwnerId(asset.getOwnerId());
             oasisDistrictCollectionDTO.setOwnerName(asset.getOwner());
@@ -170,6 +171,7 @@ public class CompanyCollectionService {
             oasisDistrictCollectionDTO.setOasisId(collection.getOasisId());
             oasisDistrictCollectionDTO.setCollectionName(collection.getName());
             oasisDistrictCollectionDTO.setOriginPrice(collection.getPrice());
+            oasisDistrictCollectionDTO.setSellPrice(collection.getPrice());
             oasisDistrictCollectionDTO.setSalable(collection.isSalable());
             oasisDistrictCollectionDTO.setOwnerId(collection.getOwnerId());
             oasisDistrictCollectionDTO.setOwnerName(collection.getOwner());
@@ -220,6 +222,7 @@ public class CompanyCollectionService {
             oasisDistrictCollectionDTO.setSalable(false);
             oasisDistrictCollectionDTO.setStatus("审核中");
             oasisDistrictCollectionDTO.setSource("官方");
+            oasisDistrictCollectionDTO.setSellPrice(companyCollection.getPrice());
 
             //查询展厅信息
             Optional<Showroom> showroom = showroomRepo.findByOasisId(companyCollection.getOasisId());