Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Good.php

@@ -155,7 +155,7 @@ class Good extends Base
                 }
             }
             $value['specinfo']=$speclist;
-            $value['noble_metal']=isset($value['noble_metal'])&&$value['noble_metal']!=0?$this->noble[$value['noble_metal']] :"";
+            $value['noble_name']=isset($value['noble_metal'])&&$value['noble_metal']!=0?$this->noble[$value['noble_metal']] :"";
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);

app/admin/controller/Title.php

@@ -117,7 +117,8 @@ class Title extends BaseController
         $page = $page >= $total ? $total : $page;
         $list = Db::name('customer_title')->alias("a")
             ->join("customer_info b","b.companyNo=a.companyNo","left")
-            ->where($where)->page($page,$size)->order("a.addtime desc")->field("a.*,b.companyName,b.creater")->select();
+            ->where($where)->page($page,$size)->field("a.*,b.companyName,b.creater,LENGTH(a.invoice_title) as weight")
+            ->order("weight asc")->select();
         return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
     }
     public function edit(){