合并分支 'Branch_liuzhen' 到 'master'

Branch liuzhen



查看合并请求 !199

 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
 
+    <input type="hidden" name="row[spec_type]" value="20">
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Admin_user_id')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Admin_user_id')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

@@ -15,6 +15,7 @@
     {else}
     {else}
     <input type="hidden" name="row[store_id]" value="{$admin_id}">
     <input type="hidden" name="row[store_id]" value="{$admin_id}">
     {/eq}
     {/eq}
+    <input type="hidden" name="row[spec_type]" value="20">
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Goods_name')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('Goods_name')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

@@ -477,7 +477,7 @@ class HouseBoard extends Api
         ];
         ];
         // 修改用户阅读状态
         // 修改用户阅读状态
         $msg_model = new Message();
         $msg_model = new Message();
-        $msg = $msg_model->findOrFail($where);
+        $msg = $msg_model->findOrFail($where,false);
         // 有消息则已读
         // 有消息则已读
         if($msg){
         if($msg){
             $edit = [
             $edit = [