Merge branch 'feature/附件功能完善' into develop

# Conflicts:
#	protected/config/routes.conf.php
#	protected/config/ver.conf.php
#	protected/controller/ClientController.php
#	protected/module/admin/model/aconfig.php

protected/module/admin/model/aconfig.php

@@ -10,18 +10,12 @@ class AConfig extends DooModel
 
     public $conid;
     public $proname;
-<<<<<<< HEAD
     public $onoff;
     public $upgradeinfo;
-    public $_table = 'jl_config';
-    public $_primarykey = 'conid';
-    public $_fields = array('conid', 'proname', 'onoff', 'upgradeinfo');
-=======
     public $smsswitch;
     public $_table = 'jl_config';
     public $_primarykey = 'conid';
-    public $_fields = array('conid', 'proname', 'smsswitch');
->>>>>>> feature/附件功能完善
+    public $_fields = array('conid', 'proname', 'onoff', 'upgradeinfo', 'smsswitch');
 
     public function __construct()
     {