commit 02c6503eaaa201cc810c927f6f12cce97fdf1797
author binquan.qiu <binquan.qiu@supwisdom.com> 周三 7月 03 16:01:57 2019 +0800
committer binquan.qiu <binquan.qiu@supwisdom.com> 周三 7月 03 16:03:46 2019 +0800
tree 51306db3b7e4771e353cd8f98efd67c7e756aa8a
parent b0087c5ed8b62c2264bb70a3db6e39ae2821fe79

食堂流水查询，导出。导入util修改，统一使用String类型

Conflicts:
	src/main/java/com/supwisdom/dlpay/framework/util/ImportExcelUtil.java

build.gradle

diff --git a/build.gradle b/build.gradle
index 566e7a0..aa4e9cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,7 @@
     id 'org.jetbrains.kotlin.plugin.spring'
 }
 
+
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.supwisdom'
@@ -77,10 +78,10 @@
         jvmTarget = jdkVersion
     }
 }
-
+/*
 compileTestKotlin {
     kotlinOptions {
         freeCompilerArgs = ['-Xjsr305=strict']
         jvmTarget = jdkVersion
     }
-}
+}*/