Merge branch 'developer' into 'master'

Developer

See merge request !26

gic-platform-auth-web/src/main/java/com/gic/auth/web/utils/ExcelUtils.java

@@ -127,7 +127,8 @@ public class ExcelUtils {
 
     public static List<Map<Integer, String>> readXlsx(Workbook xssfWorkbook, int row, Map<Integer, Boolean> dateTypeMap) {
         List<Map<Integer, String>> result = new ArrayList<Map<Integer, String>>();
-        SimpleDateFormat format = new SimpleDateFormat(Constants.DATE_FORMAT);
+        String dateFormat = "yyyy-MM-dd HH:mm:ss";
+        SimpleDateFormat format = new SimpleDateFormat(dateFormat);
 //            XSSFWorkbook xssfWorkbook = new XSSFWorkbook(in);
         for (int numSheet = 0; numSheet < 1; numSheet++) {
             Sheet xssfSheet = xssfWorkbook.getSheetAt(numSheet);