diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDefaultDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDefaultDaoController.java
index 1e7c9338a..ea8b94f93 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDefaultDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDefaultDaoController.java
@@ -87,6 +87,7 @@ public class FtFoodDefaultDaoController extends BaseController {
@Log(title = "默认报餐管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody FtFoodDefaultDao ftFoodDefaultDao) {
+ ftFoodDefaultDao.setUpdatedAt(new Date());
return toAjax(iFtFoodDefaultDaoService.updateById(ftFoodDefaultDao) ? 1 : 0);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDefaultDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDefaultDao.java
index ef1a7a6f7..c467299db 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDefaultDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDefaultDao.java
@@ -52,6 +52,8 @@ private static final long serialVersionUID=1L;
private Long createdBy;
/** 更新日期 */
+ @Excel(name = "更新日期" , width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatedAt;
/** 更新人 */
diff --git a/ruoyi-ui/src/views/fantang/foodDefault/index.vue b/ruoyi-ui/src/views/fantang/foodDefault/index.vue
index 40e1533a7..cfd2c0020 100644
--- a/ruoyi-ui/src/views/fantang/foodDefault/index.vue
+++ b/ruoyi-ui/src/views/fantang/foodDefault/index.vue
@@ -18,16 +18,16 @@
-
- 新增
-
-
+
+
+
+
+
+
+
+
+
+
修改
-
- 删除
-
-
-
- 导出
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
@@ -67,9 +67,9 @@
-
+
- {{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}
@@ -82,14 +82,14 @@
v-hasPermi="['fantang:foodDefault:edit']"
>修改
- 删除
-
+
+
+
+
+
+
+
+
@@ -201,11 +201,12 @@ export default {
getList() {
this.loading = true;
listFoodDefault(this.queryParams).then(response => {
+ console.log(response.rows)
this.foodDefaultList = response.rows;
this.total = response.total;
this.loading = false;
});
- listFood(this.queryParams).then(response => {
+ listFood().then(response => {
this.foodListOptions = response.rows;
})
},