Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj

2021-03-13 12:31:09 +08:00 · 2021-03-13 12:31:09 +08:00 · c4cb3e2180
commit c4cb3e2180
parent 20a30369bc 6fc379613f
1 changed files with 0 additions and 1 deletions
--- a/stdiet-ui/src/components/RecipesPlanDrawer/PlanPauseDrawer/index.vue
+++ b/stdiet-ui/src/components/RecipesPlanDrawer/PlanPauseDrawer/index.vue
@ -137,7 +137,6 @@
              end-placeholder="结束日期"
              format="yyyy-MM-dd"
              value-format="yyyy-MM-dd"
-              :picker-options="orderPickerOptions"
            >
            </el-date-picker>
          </el-form-item>