Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/model/dao/store.go

@@ -1654,7 +1654,6 @@ func GetStoreBaseByVendorStoreID(vendorStoreID string, vendorID int) (storeDetai
 		return nil, errors.New("vendorStoreID不能为空")
 	}
 
-	//DefaultTimeValue := utils.Str2Time("1970-01-01 00:00:00")
 	sql := `SELECT t.* FROM store t WHERE t.id = (SELECT s.store_id FROM store_map s WHERE s.vendor_store_id= ? AND s.vendor_id= ? AND s.deleted_at= '1970-01-01 00:00:00' )`
 	if err := GetRow(GetDB(), &storeDetail, sql, []interface{}{vendorStoreID, vendorID}); err != nil {
 		return nil, err