merge master

panlei

2019-11-07 6e8ebf781ac457b7ec77f7e4c9ade4c3d36002bc

 algorithm/timeSlot/timeSlot.go

@@ -2,10 +2,10 @@

import (
   "basic.com/pubsub/protomsg.git"
   "basic.com/valib/logger.git"
   "encoding/json"
   "github.com/knetic/govaluate"
   "ruleprocess/cache"
   "ruleprocess/logger"
   "ruleprocess/structure"
   "time"
)