Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

@@ -11,7 +11,7 @@ import java.util.List;
 @Data
 public class OrderDetailsVo {
     private KylinOrderTicketVo orderTicketVo;
-    private String noticeImage;
+    private String enterDescribe;
     private String express_number;
     private String express_company;
     private Integer kuaidi_status;

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -25,7 +25,7 @@ liquidnet:
   url-pay:
     pay: http://testpay.zhengzai.tv
     check: http://testpay.zhengzai.tv/order/verify
-    callback: http://zuul.zhengzai.tv/adam/member/order/callback
+    callback: http://adam.zhengzai.tv/adam/member/order/callback
   url-service:
     url: http://testservice.zhengzai.tv
   aliyun:

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -882,8 +882,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     vo.setExpress_company("");
                     vo.setKuaidi_status(-2);
                 }
-                orderTicketVo.setNoticeImage(dataUtils.getEnterInfo("1"));
                 vo.setOrderTicketVo(orderTicketVo);
+                vo.setEnterDescribe(dataUtils.getEnterInfo("1"));
             }
             return vo;
         } catch (Exception e) {