Merge branch 'master' of https://code.fnuoos.com/go_rely_warehouse/zyos_model

src/implement/happy_orchard_task_db.go

@@ -16,7 +16,7 @@ func NewHappyOrchardTaskDb(engine *xorm.Engine) dao.HappyOrchardTaskDao {
 }
 func (h HappyOrchardTaskDb) GetHappyOrchardTaskByPid(types string, pid int) (mm *[]models.HappyOrchardTask, err error) {
 	var m []models.HappyOrchardTask
-	if err := h.Db.Where("type=? and is_use=? and pid =?", types, 1, pid).Find(&m); err != nil {
+	if err := h.Db.Where("type=? and pid =?", types, pid).Find(&m); err != nil {
 		return nil, zhios_order_relate_logx.Error(err)
 	}
 	return &m, nil