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

templates/company/points_list.html

@@ -77,18 +77,18 @@
     <table id="tb-dlgs" class="table table-striped table-bordered dt-responsive" width="100%">
                 <thead>
                 <tr>
-                    <th  style='width:15%'>{% trans "经销商" %}</th>
-                    <th  style='width:20%'>{% trans "收货方积分积分" %}</th>
-                    <th  style='width:8%'>{% trans "发货方积分" %}</th>
+                    <th  style='width:12%'>{% trans "收货公司" %}</th>
+                    <th  style='width:8%'>{% trans "收货获得积分" %}</th>
+                    <th  style='width:20%'>{% trans "顶级发货信息" %}</th>
                     <th  style='width:8%'>{% trans "更新时间" %}</th>
                     <th  style='width:8%'>{% trans "操作人" %}</th>
 
                 </tr>
                 </thead>
                 <tfoot>
-                    <th><input type="text" placeholder="{% trans "经销商" %}"></th>
-                    <th><input type="text" placeholder="{% trans "收货方积分积分" %}"></th>
-                    <th><input type="text" placeholder="{% trans "发货方积分" %}"></th>
+                    <th><input type="text" placeholder="{% trans "收货公司" %}"></th>
+                    <th><input type="text" placeholder="{% trans "收货获得积分" %}"></th>
+                    <th><input type="text" placeholder="{% trans "顶级发货信息" %}"></th>
                     <th><input type="text" placeholder="{% trans "更新时间" %}"></th>
                     <th><input type="text" placeholder="{% trans "操作人" %}"></th>
             </tfoot>