Merge remote-tracking branch 'origin/master'

rk

4 天以前 b53ce008646cc62e0a0f10f4743fb6a73a6ee8bb

 server/dmmall_admin/src/main/java/com/doumee/api/business/IntegralController.java

@@ -89,7 +89,6 @@
                model.setStrType("支出");
            }
            model.setStrObjType(Constants.IntegralObjType.getName(model.getObjType()));

        }
        ExcelExporter.build(Integral.class).export(list, "用户积分明细"+ DateUtil.getNowLongTime(), response);
    }