Merge remote-tracking branch 'origin/dev' into bug

src/main/webapp/resources/view/vendor/forstore/vendor_brand_apply_list.html

@@ -80,7 +80,7 @@
                     <tr ng-repeat="brand in $data">
                         <td class="wd01">{{($index + 1)}}</td>
                         <td>{{brand.nameEn}}</td>
-                        <td>{{brand.application}}</td>
+                        <td title="{{brand.application}}">{{brand.application}}</td>
                         <td>{{brand.userModify.userName}}</td>
                         <td>{{brand.lastModifyDate | date: "yyyy-MM-dd HH:mm"}}</td>
                         <td>{{brand.status | status}}</td>