update

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantStationsServiceImpl.java

 package com.liquidnet.service.merchant.service.impl;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
 import com.liquidnet.service.merchant.dto.vo.MerchantStationsVo;
@@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.time.format.DateTimeFormatter;
 import java.util.Comparator;
 import java.util.List;
 
@@ -41,6 +43,16 @@ public class MerchantStationsServiceImpl implements IMerchantStationsService {
                 appliesVo.setBackground(fieldAppliesVo.getBackground());
                 appliesVo.setDescription(fieldAppliesVo.getDescription());
                 appliesVo.setBuiltDate(fieldAppliesVo.getBuiltDate());
+                appliesVo.setProvinceId(fieldAppliesVo.getProvinceId());
+                appliesVo.setProvinceName(fieldAppliesVo.getProvinceName());
+                appliesVo.setCityId(fieldAppliesVo.getCityId());
+                appliesVo.setCityName(fieldAppliesVo.getCityName());
+                appliesVo.setDistrictId(fieldAppliesVo.getDistrictId());
+                appliesVo.setDistrictName(fieldAppliesVo.getDistrictName());
+                appliesVo.setAddress(fieldAppliesVo.getAddress());
+                appliesVo.setLongitude(fieldAppliesVo.getLongitude());
+                appliesVo.setLatitude(fieldAppliesVo.getLatitude());
+                appliesVo.setBuiltDate(fieldAppliesVo.getBuiltDate());
                 appliesVo.setCreatedAt(fieldAppliesVo.getCreatedAt());
                 appliesVo.setUpdatedAt(fieldAppliesVo.getUpdatedAt());
                 appliesVo.setDeletedAt(fieldAppliesVo.getDeletedAt());
@@ -64,6 +76,7 @@ public class MerchantStationsServiceImpl implements IMerchantStationsService {
                 appliesVo.setApplyType(sponsorAppliesVo.getApplyType());
                 appliesVo.setReject(sponsorAppliesVo.getReject());
                 appliesVo.setUid(sponsorAppliesVo.getUid());
+                appliesVo.setSponsorId(sponsorAppliesVo.getSponsorId());
                 appliesVo.setName(sponsorAppliesVo.getName());
                 appliesVo.setLogo(sponsorAppliesVo.getLogo());
                 appliesVo.setBackground(sponsorAppliesVo.getBackground());