Merge branch 'master' into test6.9.7

mali
Commit 6d787383805c9a5df038c189ee5a3cf642223597 2 parents b2748e49 916e0e47
Showing 1 changed file with 1 additions and 1 deletions
product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java
--- a/product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java
View file @6d78738
+++ b/product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java
View file @6d78738
@@ -1639,7 +1639,7 @@ public class ProductServiceImpl implements ProductService {
         }
 
         try {
-             ApiResponse<?> soldTimeResp = ufoServiceCaller.call("ufo.order.getOrderPayTime", ApiResponse.class, skup);
+             com.yohoufo.common.ApiResponse soldTimeResp = ufoServiceCaller.call("ufo.order.getOrderPayTime", com.yohoufo.common.ApiResponse.class, skup);
             resp.setSoldTime(soldTimeResp.getData().toString());
         } catch (Exception e) {
             LOGGER.warn("获取skup销售时间出错", e);