Merge branch 'master' of https://gitee.com/sentcms/sentcms

# Conflicts:
#	public/static/admin/js/module/form.js
#	public/static/common/js/require-xlsx.js

app/controller/admin/Form.php

@@ -276,7 +276,7 @@ class Form extends Base {
 	 * @author K先森 <77413254@qq.com>
 	 */
 	public function status() {
-		$id     = $this->getArrayParam('id');
+		$id = $this->request->param('form_id', 0);
 		$status = input('status', '0', 'trim,intval');
 
 		if (!$id) {
@@ -284,7 +284,7 @@ class Form extends Base {
 		}
 
 		$map['id'] = array('IN', $id);
-		$result    = db('form')->where($map)->setField('status', $status);
+		$result    = FormM::where($map)->update(['status'=>$status]);
 		if ($result) {
 			return $this->success("设置成功！");
 		} else {