Merge branch 'master' into feature/index

# Conflicts:
#	dist/index.html

src/views/custom/contractManagement/index.vue

@@ -536,6 +536,11 @@
               <el-input v-model="scope.row.price" />
             </template>
           </el-table-column>
+          <el-table-column label="备注" min-width="110px" align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark" type="textarea" placeholder="备注" autosize maxlength="100" show-word-limit />
+            </template>
+          </el-table-column>
           <!-- <el-table-column label="使用周期" min-width="110px" align="center" valign="middle">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.lifeCycle" />