Merge remote-tracking branch 'origin/master'

src/main/java/com/lightinit/hsdataplatform/controller/admin/RelationshipManageController.java

@@ -9,6 +9,7 @@ import com.lightinit.hsdataplatform.service.admin.IApiPublishService;
 import com.lightinit.hsdataplatform.service.admin.IRelationshipManageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -104,7 +105,8 @@ public class RelationshipManageController extends BaseController {
     public ModelAndView detal(@PathVariable("id") long id, @PathVariable("resourceType") String resourceType) {
         ModelAndView modelAndView = new ModelAndView("admin/relationshipManage/detal");
         RelationshipManageViewModel model  =   relationshipManageService.detal(id,resourceType);
-        if(model.getInterfaceId()!=null) {
+//        if(!ObjectUtils.isEmpty(model.getInterfaceId())) {
+        if(model != null) {
             List<ResourceAPIRegisterAddAPIInterfaceInputModel> listIn =relationshipManageService.queryInterfaceIn(model.getInterfaceId());
             List<ResourceAPIRegisterAddAPIInterfaceOutputModel> listOut =relationshipManageService.queryInterfaceOut(model.getInterfaceId());
             modelAndView.addObject("listIn",listIn);

src/main/java/com/lightinit/hsdataplatform/model/admin/RelationshipManageViewModel.java

@@ -24,7 +24,7 @@ public class RelationshipManageViewModel {
     private String provider1;
     private String provider2;
     private String provider3;
-    private Long interfaceId;
+    private Long interfaceId ;
     /*授权属性*/
     /*输入项*/
     /*输出项*/

src/main/webapp/pages/admin/order_mgr/list.jsp

@@ -85,13 +85,13 @@
             "<tr>"+
             "<td>使用方(付款方)</td>"+
             "<td>金额</td>"+
-            "<td>付款时间</td>"+
+            "<td>下单日期</td>"+
             "<td>类型</td><td>订单号</td>"+
             "</tr></thead><tbody><tr>"+
             "<td>"+$(tr).parent().parent().children('td:eq(2)').text()+"</td>"+
             "<td>"+$(tr).parent().parent().children('td:eq(3)').text()+"</td>"+
             /*"<td>"+$(tr).parent().parent().children('td:eq(7)').text()+"</td>"+*/
-            "<td>"+$('#paymentTimeId').val()+"</td>"+
+            "<td>"+$(tr).parent().parent().children('td:eq(5)').text()+"</td>"+
             "<td>"+$(tr).parent().parent().children('td:eq(6)').text()+"</td>"+
             "<td>"+$(tr).parent().parent().children('td:eq(1)').text()+"</td>"+
             "</tr></tbody></table>";