diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php
index baf5accb..54c72507 100644
--- a/webapp/controller/BaseAuthedController.class.php
+++ b/webapp/controller/BaseAuthedController.class.php
@@ -633,7 +633,8 @@ class BaseAuthedController extends BaseController {
         if (SERVER_ENV != _ONLINE) {
             return "${itemMeta['name']} Not enough stock:${lackItem['inventory']} need:${lackItem['item_num']}";
         } else {
-            return "${itemMeta['name']} Not enough";
+//            return "${itemMeta['name']} Not enough";
+            return "item Not enough";
         }
     }
 
diff --git a/webapp/controller/MailController.class.php b/webapp/controller/MailController.class.php
index 7b9934a9..df06b363 100644
--- a/webapp/controller/MailController.class.php
+++ b/webapp/controller/MailController.class.php
@@ -118,11 +118,7 @@ class MailController extends BaseAuthedController {
 
     private static function getMailServerUrl()
     {
-        if (SERVER_ENV != _ONLINE) {
-            return "https://gamemail-test.kingsome.cn/webapp/index.php";
-        } else {
-            return "https://gamemail-test.cebggame.com/webapp/index.php";
-        }
+        return MAIL_URL;
     }
 
 }
diff --git a/webapp/models/Gun.php b/webapp/models/Gun.php
index 72a1bdf4..444df564 100644
--- a/webapp/models/Gun.php
+++ b/webapp/models/Gun.php
@@ -248,17 +248,7 @@ class Gun extends BaseModel {
             $lockType = $row['lock_type'];
             $unlockTime = $row['unlock_time'];
         }
-
-        {
-            $heroIds =array();
-            $list = HeroPreset::getByGunUid($row['idx']);
-            if ($list){
-                foreach ($list as $value){
-                    $heroDb = Hero::find($value['hero_uid']);
-                    array_push($heroIds,$heroDb['hero_id']);
-                }
-            }
-        }
+        $heroIds =array();
 
 
         $dto = array(
diff --git a/webapp/models/HeroPreset.php b/webapp/models/HeroPreset.php
index a148c9c2..33159320 100644
--- a/webapp/models/HeroPreset.php
+++ b/webapp/models/HeroPreset.php
@@ -7,20 +7,6 @@ use phpcommon;
 use phpcommon\SqlHelper;
 
 class HeroPreset extends BaseModel {
-    public static function getByGunUid($weapon_uid){
-        $rows = SqlHelper::ormSelect(
-            myself()->_getSelfMysql(),
-            't_hero_preset',
-            array(
-                'account_id' => myself()->_getAccountId(),
-                'weapon_uid1' => $weapon_uid,
-            )
-        );
-        if (!$rows){
-            return null;
-        }
-        return  $rows;
-    }
 
     public static function getHeroPreset($heroUid){
         $row = SqlHelper::ormSelectOne(