fix a bug of remind time
Merge remote-tracking branch 'origin/dev_jj' into develop