Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/views/ecw/order/detail.vue

@@ -298,7 +298,12 @@
               <template slot-scope="{row}">
                 <div v-if="row.note">
                   <div v-for="item in parseLogNote(row.note)">
-                    {{$t('【{name}】从【{orgValue}】修改为【{newValue}】',  item)}}
+                    <template v-if="item.orgValue">
+                      {{$t('【{name}】从【{orgValue}】修改为【{newValue}】',  item)}}
+                    </template>
+                    <template v-else>
+                      {{$t('【{name}】设置为【{newValue}】',  item)}}
+                    </template>
                   </div>
                 </div>
               </template>