Merge pull request '2.28号功能提交' (#186) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/186

Application/Admin/View/CompanyStatement/lists.html

@@ -585,7 +585,7 @@
                         data:{id:text},
                         success: function(data) {
                             if(data.status == 0) {
-                                layer.msg("不同类型的结算单不能放在一起汇总");
+                                layer.msg("只有下游结算单才可汇总");
                                 layer.closeAll("loading");
                             } else {
                                 var url = "{:U('poolWmStatement')}"+"&id="+text;