Merge remote-tracking branch 'origin/mark' into lcw

This commit is contained in:
renyutian
2019-04-12 16:26:16 +08:00
14 changed files with 233 additions and 53 deletions

View File

@@ -59,7 +59,7 @@ func (s StatusTimerSlice) Swap(i, j int) {
func init() {
FixedOrderManager = NewOrderManager()
partner.Init(FixedOrderManager)
partner.InitOrderManager(FixedOrderManager)
}
func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplicated bool, err error) {