* Resolve confilict.

This commit is contained in:
liuchenglong
2023-05-06 01:55:07 +00:00
11 changed files with 282 additions and 260 deletions
+8
View File
@@ -14,3 +14,11 @@ $config->programplan->edit->form['realBegan'] = array('required' => false, 'type
$config->programplan->edit->form['realEnd'] = array('required' => false, 'type' => 'string', 'default' => '0000-00-00');
$config->programplan->edit->form['output'] = array('required' => false, 'type' => 'array', 'default' => array());
$config->programplan->ajaxCustom = new stdClass();
$config->programplan->ajaxCustom->form = array();
$config->programplan->ajaxCustom->form['type'] = array('required' => true, 'type' => 'string');
$config->programplan->ajaxCustom->form['name'] = array('required' => true, 'type' => 'string');
$config->programplan->ajaxCustom->form['status'] = array('required' => true, 'type' => 'string');
$config->programplan->ajaxCustom->form['pri'] = array('required' => true, 'type' => 'int');
$config->programplan->ajaxCustom->form['date'] = array('required' => false, 'type' => 'string', 'default' => helper::today());