Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

2022-04-15 17:35:04 +08:00
parent df09ed518a 46835b6291
commit 7e3783b479
15 changed files with 253 additions and 64 deletions
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
@ -181,7 +181,7 @@ export class DatatableOrderReportingComponent implements OnInit {
            },
          }
        },
-        putTime: {
+        recentlyPutTime: {
          title: '上传时间',
          type: 'string',
          ui: {