Merge remote-tracking branch 'origin/develop' into develop

src/pages/localTool/standCalendar/index.vue

@@ -505,6 +505,8 @@ export default {
       }
       this.lastYear = selYear
       this.lastMonth = selMonth
+      // 获取日历变化的日期并显示
+      this.value = new Date(this.value.setDate(1))
       this.value = new Date(this.value.setMonth(this.value.getMonth() - monthNum))
       this.value = new Date(this.value.setFullYear(this.value.getFullYear() - yearNum))
     },

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -176,7 +176,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentStep1">
+              v-model="commentInfo">
             </el-input>
           </div>
         </el-collapse-item>