Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop

2021-02-24 08:55:57 +08:00
parent 62e2d22d24 c3910b627f
commit 13727e8d39
20 changed files with 537 additions and 95 deletions
--- a/stdiet-ui/src/views/custom/foodHeatStatistics/investigate/index.vue
+++ b/stdiet-ui/src/views/custom/foodHeatStatistics/investigate/index.vue
@ -197,7 +197,7 @@
      },
      reset(){
         this.form = {
-           edibleDate: nowDate,
+           edibleDate: this.form.edibleDate,
           ingredient: null,
           number: null,
           unit: null,