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

doum

昨天 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

 server/system_service/src/main/java/com/doumee/core/utils/Date.java

@@ -16,6 +16,9 @@
     * @return java.util.Date
     */
    public java.util.Date getStart (java.util.Date date) {
        if(date ==null){
            return null;
        }
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.set(Calendar.HOUR_OF_DAY, 0);
@@ -42,6 +45,9 @@
     * @return java.util.Date
     */
    public java.util.Date getEnd (java.util.Date date) {
        if(date ==null){
            return null;
        }
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) + 1);