Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/CanteenDiningRecordController.java

@@ -261,7 +261,7 @@ public class CanteenDiningRecordController {
             Map<String, Object> searchParams = new HashMap<>();
 
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("a.create_time", "desc"));
+            sortList.add(new Sort("a.record_time", "desc"));
 
             if (personId != null) {
                 searchParams.put("personId", personId);
@@ -351,6 +351,11 @@ public class CanteenDiningRecordController {
                 }
 
                 map.put("createTime",sdf.format(canteenDiningRecord.getCreateTime()));
+
+                if(canteenDiningRecord.getRecordTime()!=null) {
+                    map.put("recordTime", sdf.format(canteenDiningRecord.getRecordTime()));
+                }
+
                 map.put("categoryAmount",canteenDiningRecord.getCategoryAmount());
                 map.put("address",canteenDiningRecord.getAddress());
                 map.put("personName",personName);