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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

 utils/src/main/java/org/yeshi/utils/DateUtil.java

@@ -55,6 +55,8 @@
         if (hour > 0 ) {

            datatime = hour + "时" + min + "分";

         } else {

            if (min < 0)

               min = 0;

            datatime = min + "分";

         }

      }