Merge branch 'master' into development

resources/views/changeOrder/content.blade.php

@@ -199,7 +199,7 @@
                                     @if ($order_info['order_goods_type'] == 1)
                                     <!-- <td class="{{ $v['standard_brand_name'] && $v['status'] != -1 ? 'standard-brand-green' : '' }}"> -->
                                     <td>
-                                        <input type="hidden" class="change_standard_brand_id" name="change_info[{{$v['rec_id']}}][standard_brand_id]" value="{{$v['standard_brand_id']}}" />
+                                        <input type="hidden" class="change_standard_brand_id" name="change_info[{{$v['rec_id']}}][standard_brand_id]" value="{{ $v['standard_brand_id'] ? $v['standard_brand_id'] : 0 }}" />
                                         @if ($v['standard_brand_name'] || $v['status'] == -1)
                                             <input type="hidden" class="change_standard_brand_name" name="change_info[{{$v['rec_id']}}][standard_brand_name]" value="{{$v['standard_brand_name']}}"/>
                                             <p>{{$v['standard_brand_name']}}</p>